From 442620cf6b9f95d339b8dd75ff7e15824e8e9ea5 Mon Sep 17 00:00:00 2001 From: Eduardo Quezada D'Ottone Date: Wed, 20 Dec 2023 06:08:26 -0300 Subject: [PATCH] Renamed Battle Move "Split" to the proper "Category" (#3774) --- README.md | 2 +- asm/macros/battle_ai_script.inc | 783 ------- .../{split_icons.png => category_icons.png} | Bin include/battle.h | 14 +- include/battle_ai_util.h | 11 +- include/battle_util.h | 4 +- include/config/battle.h | 2 +- include/constants/pokemon.h | 8 +- include/pokemon.h | 2 +- include/test/battle.h | 4 +- src/battle_ai_main.c | 98 +- src/battle_ai_util.c | 60 +- src/battle_controller_player.c | 2 +- src/battle_dynamax.c | 6 +- src/battle_main.c | 2 +- src/battle_message.c | 2 +- src/battle_script_commands.c | 8 +- src/battle_util.c | 42 +- src/battle_z_move.c | 8 +- src/data/battle_moves.h | 1842 ++++++++--------- src/pokedex_plus_hgss.c | 94 +- src/pokemon_summary_screen.c | 84 +- test/battle/ability/beads_of_ruin.c | 2 +- test/battle/ability/contrary.c | 4 +- test/battle/ability/defeatist.c | 4 +- test/battle/ability/download.c | 4 +- test/battle/ability/dragons_maw.c | 4 +- test/battle/ability/earth_eater.c | 2 +- test/battle/ability/electromorphosis.c | 4 +- test/battle/ability/ice_scales.c | 6 +- test/battle/ability/intimidate.c | 2 +- test/battle/ability/parental_bond.c | 2 +- test/battle/ability/prankster.c | 2 +- test/battle/ability/protosynthesis.c | 4 +- test/battle/ability/quark_drive.c | 4 +- test/battle/ability/rocky_payload.c | 4 +- test/battle/ability/stamina.c | 4 +- test/battle/ability/steelworker.c | 4 +- test/battle/ability/sword_of_ruin.c | 2 +- test/battle/ability/tablets_of_ruin.c | 2 +- test/battle/ability/transistor.c | 4 +- test/battle/ability/vessel_of_ruin.c | 2 +- test/battle/ability/volt_absorb.c | 2 +- test/battle/ability/water_absorb.c | 2 +- test/battle/ability/weak_armor.c | 4 +- test/battle/ai.c | 2 +- test/battle/hold_effect/jaboca_berry.c | 6 +- test/battle/hold_effect/kee_berry.c | 6 +- test/battle/hold_effect/maranga_berry.c | 6 +- test/battle/hold_effect/rowap_berry.c | 6 +- test/battle/move.c | 4 +- test/battle/move_effect/attack_down.c | 2 +- test/battle/move_effect/attack_up.c | 2 +- test/battle/move_effect/attack_up_user_ally.c | 6 +- test/battle/move_effect/defense_down.c | 2 +- test/battle/move_effect/defense_up.c | 2 +- test/battle/move_effect/defog.c | 4 +- test/battle/move_effect/haze.c | 2 +- test/battle/move_effect/protect.c | 8 +- test/battle/move_effect/shell_trap.c | 6 +- test/battle/move_effect/special_attack_down.c | 2 +- test/battle/move_effect/special_attack_up_3.c | 2 +- test/battle/move_effect/stockpile.c | 8 +- 63 files changed, 1222 insertions(+), 2006 deletions(-) delete mode 100644 asm/macros/battle_ai_script.inc rename graphics/interface/{split_icons.png => category_icons.png} (100%) diff --git a/README.md b/README.md index 7eda2621c3..c48adac1fe 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Based off RHH's pokeemerald-expansion v1.7.0 https://github.com/rh-hideout/pokee - 2v2 Wild battles support. - 1v2/2v1 battles support. - Fairy Type (configurable). - - Physical/Special/Status Category Split (configurable). + - Physical/Special/Status Category (configurable). - New moves and abilities up to Scarlet and Violet. - Custom Contest data up to SwSh, newer moves are WIP. ([source](https://pokemonurpg.com/info/contests/rse-move-list/)) - Mega Evolution diff --git a/asm/macros/battle_ai_script.inc b/asm/macros/battle_ai_script.inc deleted file mode 100644 index eeea15dba6..0000000000 --- a/asm/macros/battle_ai_script.inc +++ /dev/null @@ -1,783 +0,0 @@ - .macro if_random_less_than param0:req, param1:req - .byte 0x0 - .byte \param0 - .4byte \param1 - .endm - - .macro if_random_greater_than param0:req, param1:req - .byte 0x1 - .byte \param0 - .4byte \param1 - .endm - - .macro if_random_equal param0:req, param1:req - .byte 0x2 - .byte \param0 - .4byte \param1 - .endm - - .macro if_random_not_equal param0:req, param1:req - .byte 0x3 - .byte \param0 - .4byte \param1 - .endm - - .macro score param0:req - .byte 0x4 - .byte \param0 - .endm - - .macro if_hp_less_than battler:req, param1:req, param2:req - .byte 0x5 - .byte \battler - .byte \param1 - .4byte \param2 - .endm - - .macro if_hp_more_than battler:req, param1:req, param2:req - .byte 0x6 - .byte \battler - .byte \param1 - .4byte \param2 - .endm - - .macro if_hp_equal battler:req, param1:req, param2:req - .byte 0x7 - .byte \battler - .byte \param1 - .4byte \param2 - .endm - - .macro if_hp_not_equal battler:req, param1:req, param2:req - .byte 0x8 - .byte \battler - .byte \param1 - .4byte \param2 - .endm - - .macro if_status battler:req, status1:req, param2:req - .byte 0x9 - .byte \battler - .4byte \status1 - .4byte \param2 - .endm - - .macro if_not_status battler:req, status1:req, param2:req - .byte 0xa - .byte \battler - .4byte \status1 - .4byte \param2 - .endm - - .macro if_status2 battler:req, status2:req, param2:req - .byte 0xb - .byte \battler - .4byte \status2 - .4byte \param2 - .endm - - .macro if_not_status2 battler:req, status2:req, param2:req - .byte 0xc - .byte \battler - .4byte \status2 - .4byte \param2 - .endm - - .macro if_status3 battler:req, status3:req, param2:req - .byte 0xd - .byte \battler - .4byte \status3 - .4byte \param2 - .endm - - .macro if_not_status3 battler:req, status3:req, param2:req - .byte 0xe - .byte \battler - .4byte \status3 - .4byte \param2 - .endm - - .macro if_side_affecting battler:req, sidestatus:req, param2:req - .byte 0xf - .byte \battler - .4byte \sidestatus - .4byte \param2 - .endm - - .macro if_not_side_affecting battler:req, sidestatus:req, param2:req - .byte 0x10 - .byte \battler - .4byte \sidestatus - .4byte \param2 - .endm - - .macro if_less_than param0:req, param1:req - .byte 0x11 - .byte \param0 - .4byte \param1 - .endm - - .macro if_more_than param0:req, param1:req - .byte 0x12 - .byte \param0 - .4byte \param1 - .endm - - .macro if_equal param0:req, param1:req - .byte 0x13 - .byte \param0 - .4byte \param1 - .endm - - .macro if_not_equal param0:req, param1:req - .byte 0x14 - .byte \param0 - .4byte \param1 - .endm - - .macro if_less_than_ptr param0:req, param1:req - .byte 0x15 - .4byte \param0 - .4byte \param1 - .endm - - .macro if_more_than_ptr param0:req, param1:req - .byte 0x16 - .4byte \param0 - .4byte \param1 - .endm - - .macro if_equal_ptr param0:req, param1:req - .byte 0x17 - .4byte \param0 - .4byte \param1 - .endm - - .macro if_not_equal_ptr param0:req, param1:req - .byte 0x18 - .4byte \param0 - .4byte \param1 - .endm - - .macro if_move param0:req, param1:req - .byte 0x19 - .2byte \param0 - .4byte \param1 - .endm - - .macro if_not_move param0:req, param1:req - .byte 0x1a - .2byte \param0 - .4byte \param1 - .endm - - .macro if_in_bytes param0:req, param1:req - .byte 0x1b - .4byte \param0 - .4byte \param1 - .endm - - .macro if_not_in_bytes param0:req, param1:req - .byte 0x1c - .4byte \param0 - .4byte \param1 - .endm - - .macro if_in_hwords param0:req, param1:req - .byte 0x1d - .4byte \param0 - .4byte \param1 - .endm - - .macro if_not_in_hwords param0:req, param1:req - .byte 0x1e - .4byte \param0 - .4byte \param1 - .endm - - .macro if_user_has_attacking_move param0:req - .byte 0x1f - .4byte \param0 - .endm - - .macro if_user_has_no_attacking_moves param0:req - .byte 0x20 - .4byte \param0 - .endm - - .macro get_turn_count - .byte 0x21 - .endm - - .macro get_type param0:req - .byte 0x22 - .byte \param0 - .endm - - .macro get_considered_move_power - .byte 0x23 - .endm - - .macro get_how_powerful_move_is - .byte 0x24 - .endm - - .macro get_last_used_bank_move battler:req - .byte 0x25 - .byte \battler - .endm - - .macro if_equal_u32 param0:req, param1:req - .byte 0x26 - .4byte \param0 - .4byte \param1 - .endm - - .macro if_not_equal_u32 param0:req, param1:req - .byte 0x27 - .4byte \param0 - .4byte \param1 - .endm - - .macro if_user_goes param0:req, param1:req - .byte 0x28 - .byte \param0 - .4byte \param1 - .endm - - .macro if_cant_use_belch battler:req, ptr:req - .byte 0x29 - .byte \battler - .4byte \ptr - .endm - - .macro nop_2A - .byte 0x2a - .endm - - .macro nop_2B - .byte 0x2b - .endm - - .macro count_usable_party_mons battler:req - .byte 0x2c - .byte \battler - .endm - - .macro get_considered_move - .byte 0x2d - .endm - - .macro get_considered_move_effect - .byte 0x2e - .endm - - .macro get_ability battler:req - .byte 0x2f - .byte \battler - .endm - - .macro get_highest_type_effectiveness - .byte 0x30 - .endm - - .macro if_type_effectiveness param0:req, param1:req - .byte 0x31 - .byte \param0 - .4byte \param1 - .endm - - .macro nop_32 - .byte 0x32 - .endm - - .macro nop_33 - .byte 0x33 - .endm - - .macro if_status_in_party battler:req, status1:req, param2:req - .byte 0x34 - .byte \battler - .4byte \status1 - .4byte \param2 - .endm - - .macro if_status_not_in_party battler:req, status1:req, param2:req - .byte 0x35 - .byte \battler - .4byte \status1 - .4byte \param2 - .endm - - .macro get_weather - .byte 0x36 - .endm - - .macro if_effect param0:req, param1:req - .byte 0x37 - .2byte \param0 - .4byte \param1 - .endm - - .macro if_not_effect param0:req, param1:req - .byte 0x38 - .2byte \param0 - .4byte \param1 - .endm - - .macro if_stat_level_less_than battler:req, stat:req, param2:req, param3:req - .byte 0x39 - .byte \battler - .byte \stat - .byte \param2 - .4byte \param3 - .endm - - .macro if_stat_level_more_than battler:req, stat:req, param2:req, param3:req - .byte 0x3a - .byte \battler - .byte \stat - .byte \param2 - .4byte \param3 - .endm - - .macro if_stat_level_equal battler:req, stat:req, param2:req, param3:req - .byte 0x3b - .byte \battler - .byte \stat - .byte \param2 - .4byte \param3 - .endm - - .macro if_stat_level_not_equal battler:req, stat:req, param2:req, param3:req - .byte 0x3c - .byte \battler - .byte \stat - .byte \param2 - .4byte \param3 - .endm - - .macro if_can_faint param0:req - .byte 0x3d - .4byte \param0 - .endm - - .macro if_cant_faint param0:req - .byte 0x3e - .4byte \param0 - .endm - - .macro if_has_move battler:req, param1:req, param2:req - .byte 0x3f - .byte \battler - .2byte \param1 - .4byte \param2 - .endm - - .macro if_doesnt_have_move battler:req, param1:req, param2:req - .byte 0x40 - .byte \battler - .2byte \param1 - .4byte \param2 - .endm - - .macro if_has_move_with_effect battler:req, param1:req, param2:req - .byte 0x41 - .byte \battler - .byte \param1 - .4byte \param2 - .endm - - .macro if_doesnt_have_move_with_effect battler:req, param1:req, param2:req - .byte 0x42 - .byte \battler - .byte \param1 - .4byte \param2 - .endm - - .macro if_any_move_disabled_or_encored battler:req, param1:req, param2:req - .byte 0x43 - .byte \battler - .byte \param1 - .4byte \param2 - .endm - - .macro if_curr_move_disabled_or_encored param0:req, param1:req - .byte 0x44 - .byte \param0 - .4byte \param1 - .endm - - .macro flee - .byte 0x45 - .endm - - .macro if_random_safari_flee param0:req - .byte 0x46 - .4byte \param0 - .endm - - .macro watch - .byte 0x47 - .endm - - .macro get_hold_effect battler:req - .byte 0x48 - .byte \battler - .endm - - .macro get_gender battler:req - .byte 0x49 - .byte \battler - .endm - - .macro is_first_turn_for battler:req - .byte 0x4a - .byte \battler - .endm - - .macro get_stockpile_count battler:req - .byte 0x4b - .byte \battler - .endm - - .macro is_double_battle - .byte 0x4c - .endm - - .macro get_used_held_item battler:req - .byte 0x4d - .byte \battler - .endm - - .macro get_move_type_from_result - .byte 0x4e - .endm - - .macro get_move_power_from_result - .byte 0x4f - .endm - - .macro get_move_effect_from_result - .byte 0x50 - .endm - - .macro get_protect_count battler:req - .byte 0x51 - .byte \battler - .endm - - .macro if_move_flag flag jumpptr - .byte 0x52 - .4byte \flag - .4byte \jumpptr - .endm - - .macro if_field_status flag jumpptr - .byte 0x53 - .4byte \flag - .4byte \jumpptr - .endm - - .macro get_move_accuracy - .byte 0x54 - .endm - - .macro call_if_eq value, ptr - .byte 0x55 - .2byte \value - .4byte \ptr - .endm - - .macro call_if_move_flag flag ptr - .byte 0x56 - .4byte \flag - .4byte \ptr - .endm - - .macro nop_57 - .byte 0x57 - .endm - - .macro call param0:req - .byte 0x58 - .4byte \param0 - .endm - - .macro goto param0:req - .byte 0x59 - .4byte \param0 - .endm - - .macro end - .byte 0x5a - .endm - - .macro if_level_cond param0:req, param1:req - .byte 0x5b - .byte \param0 - .4byte \param1 - .endm - - .macro if_target_taunted param0:req - .byte 0x5c - .4byte \param0 - .endm - - .macro if_target_not_taunted param0:req - .byte 0x5d - .4byte \param0 - .endm - - .macro if_target_is_ally param0:req - .byte 0x5e - .4byte \param0 - .endm - - .macro is_of_type battler:req, type:req - .byte 0x5f - .byte \battler - .byte \type - .endm - - .macro check_ability battler:req, ability:req - .byte 0x60 - .byte \battler - .byte \ability - .endm - - .macro if_flash_fired battler:req, param1:req - .byte 0x61 - .byte \battler - .4byte \param1 - .endm - - .macro if_holds_item battler:req, param1:req, param2:req - .byte 0x62 - .byte \battler - .2byte \param1 - .4byte \param2 - .endm - - .macro get_ally_chosen_move - .byte 0x63 - .endm - - .macro if_has_no_attacking_moves battler:req, param1:req - .byte 0x64 - .byte \battler - .4byte \param1 - .endm - - .macro get_hazards_count battler:req, effect:req - .byte 0x65 - .byte \battler - .2byte \effect - .endm - - .macro if_doesnt_hold_berry battler:req, ptr:req - .byte 0x66 - .byte \battler - .4byte \ptr - .endm - - .macro if_share_type battler1:req, battler2:req, ptr:req - .byte 0x67 - .byte \battler1 - .byte \battler2 - .4byte \ptr - .endm - - .macro if_cant_use_last_resort battler:req, ptr:req - .byte 0x68 - .byte \battler - .4byte \ptr - .endm - - .macro if_has_move_with_split battler:req, split:req, ptr:req - .byte 0x69 - .byte \battler - .byte \split - .4byte \ptr - .endm - - .macro if_has_no_move_with_split battler:req, split:req, ptr:req - .byte 0x6A - .byte \battler - .byte \split - .4byte \ptr - .endm - - .macro if_physical_moves_unusable attacker:req, target:req, ptr:req - .byte 0x6B - .byte \attacker - .byte \target - .4byte \ptr - .endm - - .macro if_ai_can_go_down ptr:req - .byte 0x6C - .4byte \ptr - .endm - - .macro if_has_move_with_type battler:req, type:req, ptr:req - .byte 0x6D - .byte \battler - .byte \type - .4byte \ptr - .endm - - .macro if_no_move_used battler:req, ptr:req - .byte 0x6E - .byte \battler - .4byte \ptr - .endm - - .macro if_has_move_with_flag battler:req, flag:req, ptr:req - .byte 0x6F - .byte \battler - .4byte \flag - .4byte \ptr - .endm - - .macro if_battler_absent battler:req, ptr:req - .byte 0x70 - .byte \battler - .4byte \ptr - .endm - - .macro if_grounded battler:req, ptr:req - .byte 0x71 - .byte \battler - .4byte \ptr - .endm - - .macro get_best_dmg_hp_percent - .byte 0x72 - .endm - - .macro get_curr_dmg_hp_percent - .byte 0x73 - .endm - - .macro get_move_split_from_result - .byte 0x74 - .endm - - .macro get_considered_move_split - .byte 0x75 - .endm - - .macro get_considered_move_target - .byte 0x76 - .endm - - .macro compare_speeds battler1:req, battler2:req - .byte 0x77 - .byte \battler1 - .byte \battler2 - .endm - - .macro is_wakeup_turn battler:req - .byte 0x78 - .byte \battler - .endm - - .macro if_has_move_with_accuracy_lt battler:req, value:req, ptr:req - .byte 0x79 - .byte \battler - .byte \value - .4byte \ptr - .endm - -@ useful script macros - .macro if_has_physical_move battler:req, ptr:req - if_has_move_with_split \battler, SPLIT_PHYSICAL, \ptr - .endm - - .macro if_has_no_physical_move battler:req, ptr:req - if_has_no_move_with_split \battler, SPLIT_PHYSICAL, \ptr - .endm - - .macro if_has_special_move battler:req, ptr:req - if_has_move_with_split \battler, SPLIT_SPECIAL, \ptr - .endm - - .macro if_has_no_special_move battler:req, ptr:req - if_has_no_move_with_split \battler, SPLIT_SPECIAL, \ptr - .endm - - .macro if_holds_no_item battler, ptr:req - if_holds_item \battler, 0, \ptr - .endm - - .macro get_curr_move_type - get_type AI_TYPE_MOVE - .endm - - .macro get_user_type1 - get_type AI_TYPE1_USER - .endm - - .macro get_user_type2 - get_type AI_TYPE2_USER - .endm - - .macro get_target_type1 - get_type AI_TYPE1_TARGET - .endm - - .macro get_target_type2 - get_type AI_TYPE2_TARGET - .endm - - .macro if_ability battler:req, ability:req, ptr:req - check_ability \battler, \ability - if_equal 1, \ptr - .endm - - .macro if_no_ability battler:req, ability:req, ptr:req - check_ability \battler, \ability - if_equal 0, \ptr - .endm - - .macro if_type battler:req, type:req, ptr:req - is_of_type \battler, \type - if_equal 1, \ptr - .endm - - .macro if_no_type battler:req, type:req, ptr:req - is_of_type \battler, \type - if_equal 0, \ptr - .endm - - .macro if_target_faster ptr:req - if_user_goes 1, \ptr - .endm - - .macro if_user_faster ptr:req - if_user_goes 0, \ptr - .endm - - .macro if_double_battle ptr:req - is_double_battle - if_equal 1, \ptr - .endm - - .macro if_not_double_battle ptr:req - is_double_battle - if_equal 0, \ptr - .endm - - .macro if_any_move_disabled battler:req, ptr:req - if_any_move_disabled_or_encored \battler, 0, \ptr - .endm - - .macro if_any_move_encored battler:req, ptr:req - if_any_move_disabled_or_encored \battler, 1, \ptr - .endm - - .macro call_if_always_hit ptr:req - get_move_accuracy - call_if_eq 0, \ptr - .endm diff --git a/graphics/interface/split_icons.png b/graphics/interface/category_icons.png similarity index 100% rename from graphics/interface/split_icons.png rename to graphics/interface/category_icons.png diff --git a/include/battle.h b/include/battle.h index e784345788..a8f9ad2308 100644 --- a/include/battle.h +++ b/include/battle.h @@ -545,7 +545,7 @@ struct ZMoveData u8 active:1; // is z move being used this turn u8 zStatusActive:1; u8 healReplacement:1; - u8 activeSplit:2; // active z move split + u8 activeCategory:2; // active z move category u8 zUnused:1; u8 triggerSpriteId; u8 possibleZMoves[MAX_BATTLERS_COUNT]; @@ -554,7 +554,7 @@ struct ZMoveData u8 used[MAX_BATTLERS_COUNT]; //one per bank for multi-battles u16 toBeUsed[MAX_BATTLERS_COUNT]; // z moves per battler to be used u16 baseMoves[MAX_BATTLERS_COUNT]; - u8 splits[MAX_BATTLERS_COUNT]; + u8 categories[MAX_BATTLERS_COUNT]; }; struct DynamaxData @@ -566,8 +566,8 @@ struct DynamaxData bool8 dynamaxed[MAX_BATTLERS_COUNT]; u8 dynamaxTurns[MAX_BATTLERS_COUNT]; u8 usingMaxMove[MAX_BATTLERS_COUNT]; - u8 activeSplit; - u8 splits[MAX_BATTLERS_COUNT]; + u8 activeCategory; + u8 categories[MAX_BATTLERS_COUNT]; u16 baseMove[MAX_BATTLERS_COUNT]; // base move of Max Move u16 lastUsedBaseMove; u16 levelUpHP; @@ -761,9 +761,9 @@ STATIC_ASSERT(sizeof(((struct BattleStruct *)0)->palaceFlags) * 8 >= MAX_BATTLER typeArg = gBattleMoves[move].type; \ } -#define IS_MOVE_PHYSICAL(move)(GetBattleMoveSplit(move) == SPLIT_PHYSICAL) -#define IS_MOVE_SPECIAL(move)(GetBattleMoveSplit(move) == SPLIT_SPECIAL) -#define IS_MOVE_STATUS(move)(gBattleMoves[move].split == SPLIT_STATUS) +#define IS_MOVE_PHYSICAL(move)(GetBattleMoveCategory(move) == BATTLE_CATEGORY_PHYSICAL) +#define IS_MOVE_SPECIAL(move)(GetBattleMoveCategory(move) == BATTLE_CATEGORY_SPECIAL) +#define IS_MOVE_STATUS(move)(gBattleMoves[move].category == BATTLE_CATEGORY_STATUS) #define IS_EFFECT_RECOIL(effect)(effect == EFFECT_RECOIL || effect == EFFECT_RECOIL_IF_MISS) diff --git a/include/battle_ai_util.h b/include/battle_ai_util.h index 9b30d103e4..43f6db694e 100644 --- a/include/battle_ai_util.h +++ b/include/battle_ai_util.h @@ -84,7 +84,7 @@ bool32 ShouldLowerEvasion(u32 battlerAtk, u32 battlerDef, u32 defAbility); // move checks bool32 IsAffectedByPowder(u32 battler, u32 ability, u32 holdEffect); -bool32 MovesWithSplitUnusable(u32 attacker, u32 target, u32 split); +bool32 MovesWithCategoryUnusable(u32 attacker, u32 target, u32 category); u32 AI_WhichMoveBetter(u32 move1, u32 move2, u32 battlerAtk, u32 battlerDef, s32 noOfHitsToKo); s32 AI_CalcDamageSaveBattlers(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectiveness, bool32 considerZPower); s32 AI_CalcDamage(u32 move, u32 battlerAtk, u32 battlerDef, u8 *typeEffectiveness, bool32 considerZPower, u32 weather); @@ -98,10 +98,9 @@ u32 AI_GetMoveEffectiveness(u32 move, u32 battlerAtk, u32 battlerDef); u16 *GetMovesArray(u32 battler); bool32 IsConfusionMoveEffect(u32 moveEffect); bool32 HasMove(u32 battlerId, u32 move); -bool32 HasOnlyMovesWithSplit(u32 battlerId, u32 split, bool32 onlyOffensive); -bool32 HasMoveWithSplit(u32 battler, u32 split); +bool32 HasOnlyMovesWithCategory(u32 battlerId, u32 category, bool32 onlyOffensive); +bool32 HasMoveWithCategory(u32 battler, u32 category); bool32 HasMoveWithType(u32 battler, u32 type); -bool32 HasMoveWithTypeAndSplit(u32 battler, u32 type, u32 split); bool32 HasMoveEffect(u32 battlerId, u32 moveEffect); bool32 HasMoveWithLowAccuracy(u32 battlerAtk, u32 battlerDef, u32 accCheck, bool32 ignoreStatus, u32 atkAbility, u32 defAbility, u32 atkHoldEffect, u32 defHoldEffect); bool32 IsAromaVeilProtectedMove(u32 move); @@ -177,8 +176,8 @@ struct BattlePokemon *AllocSaveBattleMons(void); void FreeRestoreBattleMons(struct BattlePokemon *savedBattleMons); s32 CountUsablePartyMons(u32 battlerId); bool32 IsPartyFullyHealedExceptBattler(u32 battler); -bool32 PartyHasMoveSplit(u32 battlerId, u32 split); -bool32 SideHasMoveSplit(u32 battlerId, u32 split); +bool32 PartyHasMoveCategory(u32 battlerId, u32 category); +bool32 SideHasMoveCategory(u32 battlerId, u32 category); // score increases void IncreaseStatUpScore(u32 battlerAtk, u32 battlerDef, u32 statId, s32 *score); diff --git a/include/battle_util.h b/include/battle_util.h index f58a5a1543..276f364615 100644 --- a/include/battle_util.h +++ b/include/battle_util.h @@ -193,13 +193,13 @@ struct Pokemon *GetIllusionMonPtr(u32 battler); void ClearIllusionMon(u32 battler); bool32 SetIllusionMon(struct Pokemon *mon, u32 battler); bool32 ShouldGetStatBadgeBoost(u16 flagId, u32 battler); -u8 GetBattleMoveSplit(u32 moveId); +u8 GetBattleMoveCategory(u32 moveId); bool32 CanFling(u32 battler); bool32 IsTelekinesisBannedSpecies(u16 species); bool32 IsHealBlockPreventingMove(u32 battler, u32 move); bool32 HasEnoughHpToEatBerry(u32 battler, u32 hpFraction, u32 itemId); bool32 IsPartnerMonFromSameTrainer(u32 battler); -u8 GetSplitBasedOnStats(u32 battler); +u8 GetCategoryBasedOnStats(u32 battler); bool32 TestSheerForceFlag(u32 battler, u16 move); void TryRestoreHeldItems(void); bool32 CanStealItem(u32 battlerStealing, u32 battlerItem, u16 item); diff --git a/include/config/battle.h b/include/config/battle.h index 90c8728dde..a3dc007ae3 100644 --- a/include/config/battle.h +++ b/include/config/battle.h @@ -200,7 +200,7 @@ #define B_FAST_INTRO TRUE // If set to TRUE, battle intro texts print at the same time as animation of a Pokémon, as opposing to waiting for the animation to end. #define B_FAST_HP_DRAIN TRUE // If set to TRUE, HP bars will move faster to accomodate higher max HP amounts. #define B_SHOW_TARGETS TRUE // If set to TRUE, all available targets, for moves hitting 2 or 3 Pokémon, will be shown before selecting a move. -#define B_SHOW_SPLIT_ICON TRUE // If set to TRUE, it will show an icon in the summary showing the move's category split. +#define B_SHOW_CATEGORY_ICON TRUE // If set to TRUE, it will show an icon in the summary showing the move's category. #define B_HIDE_HEALTHBOX_IN_ANIMS TRUE // If set to TRUE, hides healthboxes during move animations. #define B_EXPANDED_MOVE_NAMES FALSE // If set to TRUE, move names are increased from 12 characters to 16 characters. #define B_WAIT_TIME_MULTIPLIER 16 // This determines how long text pauses in battle last. Vanilla is 16. Lower values result in faster battles. diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 4f36d1b543..5b675ef835 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -225,10 +225,10 @@ #define EV_ITEM_RAISE_LIMIT 100 #endif -// Split defines. -#define SPLIT_PHYSICAL 0x0 -#define SPLIT_SPECIAL 0x1 -#define SPLIT_STATUS 0x2 +// Move category defines. +#define BATTLE_CATEGORY_PHYSICAL 0 +#define BATTLE_CATEGORY_SPECIAL 1 +#define BATTLE_CATEGORY_STATUS 2 // Just for readability #define ALWAYS_CRIT 3 diff --git a/include/pokemon.h b/include/pokemon.h index 87630814db..7426315d88 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -408,7 +408,7 @@ struct BattleMove u16 effect; u8 power; u8 type:5; - u8 split:3; + u8 category:3; u16 accuracy:7; u16 recoil:7; diff --git a/include/test/battle.h b/include/test/battle.h index c83a61891d..cb62e5b56f 100644 --- a/include/test/battle.h +++ b/include/test/battle.h @@ -129,7 +129,7 @@ * PARAMETRIZE { raiseAttack = FALSE; } * PARAMETRIZE { raiseAttack = TRUE; } * GIVEN { - * ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + * ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); * PLAYER(SPECIES_WOBBUFFET); * OPPONENT(SPECIES_WOBBUFFET); * } WHEN { @@ -176,7 +176,7 @@ * Pokémon we can observe the damage of a physical attack with and * without the burn. To document that this test assumes the attack is * physical we can use: - * ASSUME(gBattleMoves[MOVE_WHATEVER].split == SPLIT_PHYSICAL); + * ASSUME(gBattleMoves[MOVE_WHATEVER].category == BATTLE_CATEGORY_PHYSICAL); * * ASSUMPTIONS * Should be placed immediately after any #includes and contain any diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index 4037d3b6f7..f38551fb06 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -1045,7 +1045,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_ATTACK_UP: case EFFECT_ATTACK_UP_2: case EFFECT_ATTACK_UP_USER_ALLY: - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); break; case EFFECT_STUFF_CHEEKS: @@ -1062,7 +1062,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_SPECIAL_ATTACK_UP: case EFFECT_SPECIAL_ATTACK_UP_2: case EFFECT_SPECIAL_ATTACK_UP_3: - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithSplit(battlerAtk, SPLIT_SPECIAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)) ADJUST_SCORE(-10); break; case EFFECT_SPECIAL_DEFENSE_UP: @@ -1088,7 +1088,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(-8); break; case EFFECT_BULK_UP: - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_DEF)) ADJUST_SCORE(-8); @@ -1100,7 +1100,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(-8); break; case EFFECT_DRAGON_DANCE: - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPEED)) ADJUST_SCORE(-8); @@ -1108,7 +1108,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_COIL: if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ACC)) ADJUST_SCORE(-10); - else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-8); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_DEF)) ADJUST_SCORE(-6); @@ -1117,7 +1117,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (aiData->abilities[battlerAtk] != ABILITY_CONTRARY) { if (gBattleMons[battlerAtk].statStages[STAT_ATK] >= MAX_STAT_STAGE - && (gBattleMons[battlerAtk].statStages[STAT_ACC] >= MAX_STAT_STAGE || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL))) + && (gBattleMons[battlerAtk].statStages[STAT_ACC] >= MAX_STAT_STAGE || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL))) ADJUST_SCORE(-10); break; } @@ -1137,7 +1137,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_QUIVER_DANCE: case EFFECT_GEOMANCY: - if (gBattleMons[battlerAtk].statStages[STAT_SPATK] >= MAX_STAT_STAGE || !HasMoveWithSplit(battlerAtk, SPLIT_SPECIAL)) + if (gBattleMons[battlerAtk].statStages[STAT_SPATK] >= MAX_STAT_STAGE || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPEED)) ADJUST_SCORE(-8); @@ -1145,7 +1145,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(-6); break; case EFFECT_VICTORY_DANCE: - if (gBattleMons[battlerAtk].statStages[STAT_ATK] >= MAX_STAT_STAGE || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (gBattleMons[battlerAtk].statStages[STAT_ATK] >= MAX_STAT_STAGE || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPEED)) ADJUST_SCORE(-8); @@ -1153,7 +1153,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) ADJUST_SCORE(-6); break; case EFFECT_SHIFT_GEAR: - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPEED)) ADJUST_SCORE(-8); @@ -1168,9 +1168,9 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) } else { - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); - else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithSplit(battlerAtk, SPLIT_SPECIAL)) + else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)) ADJUST_SCORE(-8); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPEED)) ADJUST_SCORE(-6); @@ -1208,9 +1208,9 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (aiData->abilities[battlerAtk] == ABILITY_PLUS || aiData->abilities[battlerAtk] == ABILITY_MINUS) { // same as growth, work up - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); - else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithSplit(battlerAtk, SPLIT_SPECIAL)) + else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)) ADJUST_SCORE(-8); break; } @@ -1223,8 +1223,8 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) { if (aiData->abilities[BATTLE_PARTNER(battlerAtk)] == ABILITY_PLUS || aiData->abilities[BATTLE_PARTNER(battlerAtk)] == ABILITY_MINUS) { - if ((!BattlerStatCanRise(BATTLE_PARTNER(battlerAtk), aiData->abilities[BATTLE_PARTNER(battlerAtk)], STAT_ATK) || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) - && (!BattlerStatCanRise(BATTLE_PARTNER(battlerAtk), aiData->abilities[BATTLE_PARTNER(battlerAtk)], STAT_SPATK) || !HasMoveWithSplit(battlerAtk, SPLIT_SPECIAL))) + if ((!BattlerStatCanRise(BATTLE_PARTNER(battlerAtk), aiData->abilities[BATTLE_PARTNER(battlerAtk)], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) + && (!BattlerStatCanRise(BATTLE_PARTNER(battlerAtk), aiData->abilities[BATTLE_PARTNER(battlerAtk)], STAT_SPATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL))) ADJUST_SCORE(-10); } else if (aiData->abilities[battlerAtk] != ABILITY_PLUS && aiData->abilities[battlerAtk] != ABILITY_MINUS) @@ -1268,7 +1268,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) // stat lowering effects case EFFECT_ATTACK_DOWN: case EFFECT_ATTACK_DOWN_2: - if (!ShouldLowerStat(battlerDef, aiData->abilities[battlerDef], STAT_ATK)) //|| !HasMoveWithSplit(battlerDef, SPLIT_PHYSICAL)) + if (!ShouldLowerStat(battlerDef, aiData->abilities[battlerDef], STAT_ATK)) //|| !HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (aiData->abilities[battlerDef] == ABILITY_HYPER_CUTTER) ADJUST_SCORE(-10); @@ -1287,7 +1287,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_SPECIAL_ATTACK_DOWN: case EFFECT_SPECIAL_ATTACK_DOWN_2: - if (!ShouldLowerStat(battlerDef, aiData->abilities[battlerDef], STAT_SPATK)) //|| !HasMoveWithSplit(battlerDef, SPLIT_SPECIAL)) + if (!ShouldLowerStat(battlerDef, aiData->abilities[battlerDef], STAT_SPATK)) //|| !HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL)) ADJUST_SCORE(-10); break; case EFFECT_SPECIAL_DEFENSE_DOWN: @@ -1374,7 +1374,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_MIRROR_COAT: if (IsBattlerIncapacitated(battlerDef, aiData->abilities[battlerDef]) || gBattleMons[battlerDef].status2 & (STATUS2_INFATUATION | STATUS2_CONFUSION)) ADJUST_SCORE(-1); - if (predictedMove == MOVE_NONE || GetBattleMoveSplit(predictedMove) == SPLIT_STATUS + if (predictedMove == MOVE_NONE || GetBattleMoveCategory(predictedMove) == BATTLE_CATEGORY_STATUS || DoesSubstituteBlockMove(battlerAtk, BATTLE_PARTNER(battlerDef), predictedMove)) ADJUST_SCORE(-10); break; @@ -1519,7 +1519,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) } else // regular curse { - if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_ATK) || !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); else if (!BattlerStatCanRise(battlerAtk, aiData->abilities[battlerAtk], STAT_DEF)) ADJUST_SCORE(-8); @@ -2176,7 +2176,7 @@ static s32 AI_CheckBadMove(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case EFFECT_POWER_TRICK: if (IS_TARGETING_PARTNER(battlerAtk, battlerDef)) ADJUST_SCORE(-10); - else if (gBattleMons[battlerAtk].defense >= gBattleMons[battlerAtk].attack && !HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + else if (gBattleMons[battlerAtk].defense >= gBattleMons[battlerAtk].attack && !HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-10); break; case EFFECT_POWER_SWAP: // Don't use if attacker's stat stages are higher than opponents @@ -2814,7 +2814,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case ABILITY_LIGHTNING_ROD: if (moveType == TYPE_ELECTRIC - && HasMoveWithSplit(battlerAtkPartner, SPLIT_SPECIAL) + && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_SPECIAL) && BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_SPATK)) { RETURN_SCORE_PLUS(1); @@ -2829,7 +2829,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; // handled in AI_HPAware case ABILITY_STORM_DRAIN: if (moveType == TYPE_WATER - && HasMoveWithSplit(battlerAtkPartner, SPLIT_SPECIAL) + && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_SPECIAL) && BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_SPATK)) { RETURN_SCORE_PLUS(1); @@ -2852,7 +2852,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case ABILITY_SAP_SIPPER: if (moveType == TYPE_GRASS - && HasMoveWithSplit(battlerAtkPartner, SPLIT_PHYSICAL) + && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_PHYSICAL) && BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_ATK)) { RETURN_SCORE_PLUS(1); @@ -2861,7 +2861,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) case ABILITY_JUSTIFIED: if (moveType == TYPE_DARK && !IS_MOVE_STATUS(move) - && HasMoveWithSplit(battlerAtkPartner, SPLIT_PHYSICAL) + && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_PHYSICAL) && BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_ATK) && !CanIndexMoveFaintTarget(battlerAtk, battlerAtkPartner, AI_THINKING_STRUCT->movesetIndex, 1)) { @@ -2913,7 +2913,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_SWAGGER: if (gBattleMons[battlerAtkPartner].statStages[STAT_ATK] < MAX_STAT_STAGE - && HasMoveWithSplit(battlerAtkPartner, SPLIT_PHYSICAL) + && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_PHYSICAL) && (!AI_CanBeConfused(battlerAtkPartner, TRUE) || atkPartnerHoldEffect == HOLD_EFFECT_CURE_CONFUSION || atkPartnerHoldEffect == HOLD_EFFECT_CURE_STATUS)) @@ -2923,7 +2923,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) break; case EFFECT_FLATTER: if (gBattleMons[battlerAtkPartner].statStages[STAT_SPATK] < MAX_STAT_STAGE - && HasMoveWithSplit(battlerAtkPartner, SPLIT_SPECIAL) + && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_SPECIAL) && (!AI_CanBeConfused(battlerAtkPartner, TRUE) || atkPartnerHoldEffect == HOLD_EFFECT_CURE_CONFUSION || atkPartnerHoldEffect == HOLD_EFFECT_CURE_STATUS)) @@ -2935,7 +2935,7 @@ static s32 AI_DoubleBattle(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) if (atkPartnerAbility == ABILITY_JUSTIFIED && moveType == TYPE_DARK && !IS_MOVE_STATUS(move) - && HasMoveWithSplit(battlerAtkPartner, SPLIT_PHYSICAL) + && HasMoveWithCategory(battlerAtkPartner, BATTLE_CATEGORY_PHYSICAL) && BattlerStatCanRise(battlerAtkPartner, atkPartnerAbility, STAT_ATK) && !CanIndexMoveFaintTarget(battlerAtk, battlerAtkPartner, AI_THINKING_STRUCT->movesetIndex, 0)) { @@ -3200,7 +3200,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score u32 i; // The AI should understand that while Dynamaxed, status moves function like Protect. - if (IsDynamaxed(battlerAtk) && gBattleMoves[move].split == SPLIT_STATUS) + if (IsDynamaxed(battlerAtk) && gBattleMoves[move].category == BATTLE_CATEGORY_STATUS) moveEffect = EFFECT_PROTECT; // Targeting partner, check benefits of doing that instead @@ -3241,8 +3241,8 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score // check burn / frostbite if (AI_THINKING_STRUCT->aiFlags & AI_FLAG_SMART_SWITCHING && AI_DATA->abilities[battlerAtk] == ABILITY_NATURAL_CURE) { - if ((gBattleMons[battlerAtk].status1 & STATUS1_BURN && HasOnlyMovesWithSplit(battlerAtk, SPLIT_PHYSICAL, TRUE)) - || (gBattleMons[battlerAtk].status1 & STATUS1_FROSTBITE && HasOnlyMovesWithSplit(battlerAtk, SPLIT_SPECIAL, TRUE))) + if ((gBattleMons[battlerAtk].status1 & STATUS1_BURN && HasOnlyMovesWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL, TRUE)) + || (gBattleMons[battlerAtk].status1 & STATUS1_FROSTBITE && HasOnlyMovesWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL, TRUE))) ADJUST_SCORE(-20); // Force switch if all your attacking moves are physical and you have Natural Cure. } @@ -3275,7 +3275,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score case EFFECT_ATTACK_UP: case EFFECT_ATTACK_UP_2: case EFFECT_ATTACK_UP_USER_ALLY: - if (MovesWithSplitUnusable(battlerAtk, battlerDef, SPLIT_PHYSICAL)) + if (MovesWithCategoryUnusable(battlerAtk, battlerDef, BATTLE_CATEGORY_PHYSICAL)) { ADJUST_SCORE(-8); break; @@ -3297,7 +3297,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score case EFFECT_DEFENSE_UP: case EFFECT_DEFENSE_UP_2: case EFFECT_DEFENSE_UP_3: - if (!HasMoveWithSplit(battlerDef, SPLIT_PHYSICAL)) + if (!HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(-2); if (aiData->hpPercents[battlerAtk] > 90 && AI_RandLessThan(128)) ADJUST_SCORE(2); @@ -3321,7 +3321,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score case EFFECT_SPECIAL_ATTACK_UP: case EFFECT_SPECIAL_ATTACK_UP_2: case EFFECT_SPECIAL_ATTACK_UP_3: - if (MovesWithSplitUnusable(battlerAtk, battlerDef, SPLIT_SPECIAL)) + if (MovesWithCategoryUnusable(battlerAtk, battlerDef, BATTLE_CATEGORY_SPECIAL)) { ADJUST_SCORE(-8); break; @@ -3342,7 +3342,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score break; case EFFECT_SPECIAL_DEFENSE_UP: case EFFECT_SPECIAL_DEFENSE_UP_2: - if (!HasMoveWithSplit(battlerDef, SPLIT_SPECIAL)) + if (!HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL)) ADJUST_SCORE(-2); if (aiData->hpPercents[battlerAtk] > 90 && AI_RandLessThan(128)) ADJUST_SCORE(2); @@ -3483,9 +3483,9 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score if (aiData->hpPercents[battlerAtk] <= 40 || aiData->abilities[battlerAtk] == ABILITY_CONTRARY) break; - if (HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) IncreaseStatUpScore(battlerAtk, battlerDef, STAT_ATK, &score); - else if (HasMoveWithSplit(battlerAtk, SPLIT_SPECIAL)) + else if (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)) IncreaseStatUpScore(battlerAtk, battlerDef, STAT_SPATK, &score); break; case EFFECT_HAZE: @@ -3700,7 +3700,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score if (CountUsablePartyMons(battlerAtk) == 0) break; // Can't switch - //if (switchAbility == ABILITY_INTIMIDATE && PartyHasMoveSplit(battlerDef, SPLIT_PHYSICAL)) + //if (switchAbility == ABILITY_INTIMIDATE && PartyHasMoveCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) //ADJUST_SCORE(7); } break; @@ -4041,7 +4041,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score } break; case EFFECT_BELLY_DRUM: - if (!CanTargetFaintAi(battlerDef, battlerAtk) && HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL) && aiData->abilities[battlerAtk] != ABILITY_CONTRARY) + if (!CanTargetFaintAi(battlerDef, battlerAtk) && HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL) && aiData->abilities[battlerAtk] != ABILITY_CONTRARY) score += (MAX_STAT_STAGE - gBattleMons[battlerAtk].statStages[STAT_ATK]); break; case EFFECT_PSYCH_UP: @@ -4054,11 +4054,11 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score switch (i) { case STAT_ATK: - if (HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(1); break; case STAT_SPATK: - if (HasMoveWithSplit(battlerAtk, SPLIT_SPECIAL)) + if (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL)) ADJUST_SCORE(1); break; case STAT_ACC: @@ -4237,7 +4237,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score case EFFECT_TAUNT: if (IS_MOVE_STATUS(predictedMove)) ADJUST_SCORE(3); - else if (HasMoveWithSplit(battlerDef, SPLIT_STATUS)) + else if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_STATUS)) ADJUST_SCORE(2); break; case EFFECT_TRICK: @@ -4248,11 +4248,11 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score ADJUST_SCORE(2); // assume its beneficial break; case HOLD_EFFECT_CHOICE_BAND: - if (!HasMoveWithSplit(battlerDef, SPLIT_PHYSICAL)) + if (!HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(2); break; case HOLD_EFFECT_CHOICE_SPECS: - if (!HasMoveWithSplit(battlerDef, SPLIT_SPECIAL)) + if (!HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL)) ADJUST_SCORE(2); break; case HOLD_EFFECT_TOXIC_ORB: @@ -4458,7 +4458,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score ADJUST_SCORE(1); break; case EFFECT_TICKLE: - if (gBattleMons[battlerDef].statStages[STAT_DEF] > 4 && HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL) + if (gBattleMons[battlerDef].statStages[STAT_DEF] > 4 && HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL) && aiData->abilities[battlerDef] != ABILITY_CONTRARY && ShouldLowerDefense(battlerAtk, battlerDef, aiData->abilities[battlerDef])) { ADJUST_SCORE(2); @@ -4526,7 +4526,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score case EFFECT_POWER_TRICK: if (!(gStatuses3[battlerAtk] & STATUS3_POWER_TRICK)) { - if (gBattleMons[battlerAtk].defense > gBattleMons[battlerAtk].attack && HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL)) + if (gBattleMons[battlerAtk].defense > gBattleMons[battlerAtk].attack && HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL)) ADJUST_SCORE(2); break; } @@ -4626,8 +4626,8 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score ADJUST_SCORE(1); break; case EFFECT_WONDER_ROOM: - if ((HasMoveWithSplit(battlerDef, SPLIT_PHYSICAL) && gBattleMons[battlerAtk].defense < gBattleMons[battlerAtk].spDefense) - || (HasMoveWithSplit(battlerDef, SPLIT_SPECIAL) && gBattleMons[battlerAtk].spDefense < gBattleMons[battlerAtk].defense)) + if ((HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL) && gBattleMons[battlerAtk].defense < gBattleMons[battlerAtk].spDefense) + || (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL) && gBattleMons[battlerAtk].spDefense < gBattleMons[battlerAtk].defense)) ADJUST_SCORE(2); break; case EFFECT_GRAVITY: @@ -4791,7 +4791,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score { if (gDisableStructs[battlerDef].tauntTimer != 0) ADJUST_SCORE(1); // target must use damaging move - if (GetNoOfHitsToKOBattler(battlerDef, battlerAtk, predictedMoveSlot) >= 2 && GetBattleMoveSplit(predictedMove) == SPLIT_PHYSICAL) + if (GetNoOfHitsToKOBattler(battlerDef, battlerAtk, predictedMoveSlot) >= 2 && GetBattleMoveCategory(predictedMove) == BATTLE_CATEGORY_PHYSICAL) ADJUST_SCORE(3); } break; @@ -4800,7 +4800,7 @@ static s32 AI_CheckViability(u32 battlerAtk, u32 battlerDef, u32 move, s32 score { if (gDisableStructs[battlerDef].tauntTimer != 0) ADJUST_SCORE(1); // target must use damaging move - if (GetNoOfHitsToKOBattler(battlerDef, battlerAtk, predictedMoveSlot) >= 2 && GetBattleMoveSplit(predictedMove) == SPLIT_SPECIAL) + if (GetNoOfHitsToKOBattler(battlerDef, battlerAtk, predictedMoveSlot) >= 2 && GetBattleMoveCategory(predictedMove) == BATTLE_CATEGORY_SPECIAL) ADJUST_SCORE(3); } break; diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 27be0f2549..9fab0ef65a 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -655,7 +655,7 @@ bool32 IsAffectedByPowder(u32 battler, u32 ability, u32 holdEffect) // This function checks if all physical/special moves are either unusable or unreasonable to use. // Consider a pokemon boosting their attack against a ghost pokemon having only normal-type physical attacks. -bool32 MovesWithSplitUnusable(u32 attacker, u32 target, u32 split) +bool32 MovesWithCategoryUnusable(u32 attacker, u32 target, u32 category) { s32 i, moveType; u32 usable = 0; @@ -666,7 +666,7 @@ bool32 MovesWithSplitUnusable(u32 attacker, u32 target, u32 split) { if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE - && GetBattleMoveSplit(moves[i]) == split + && GetBattleMoveCategory(moves[i]) == category && !(unusable & gBitTable[i])) { SetTypeBeforeUsingMove(moves[i], attacker); @@ -1770,7 +1770,7 @@ bool32 ShouldLowerAttack(u32 battlerAtk, u32 battlerDef, u32 defAbility) return FALSE; // Don't bother lowering stats if can kill enemy. if (gBattleMons[battlerDef].statStages[STAT_ATK] > 4 - && HasMoveWithSplit(battlerDef, SPLIT_PHYSICAL) + && HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL) && defAbility != ABILITY_CONTRARY && defAbility != ABILITY_CLEAR_BODY && defAbility != ABILITY_WHITE_SMOKE @@ -1787,7 +1787,7 @@ bool32 ShouldLowerDefense(u32 battlerAtk, u32 battlerDef, u32 defAbility) return FALSE; // Don't bother lowering stats if can kill enemy. if (gBattleMons[battlerDef].statStages[STAT_DEF] > 4 - && HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL) + && HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL) && defAbility != ABILITY_CONTRARY && defAbility != ABILITY_CLEAR_BODY && defAbility != ABILITY_WHITE_SMOKE @@ -1819,7 +1819,7 @@ bool32 ShouldLowerSpAtk(u32 battlerAtk, u32 battlerDef, u32 defAbility) return FALSE; // Don't bother lowering stats if can kill enemy. if (gBattleMons[battlerDef].statStages[STAT_SPATK] > 4 - && HasMoveWithSplit(battlerDef, SPLIT_SPECIAL) + && HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL) && defAbility != ABILITY_CONTRARY && defAbility != ABILITY_CLEAR_BODY && defAbility != ABILITY_FULL_METAL_BODY @@ -1835,7 +1835,7 @@ bool32 ShouldLowerSpDef(u32 battlerAtk, u32 battlerDef, u32 defAbility) return FALSE; // Don't bother lowering stats if can kill enemy. if (gBattleMons[battlerDef].statStages[STAT_SPDEF] > 4 - && HasMoveWithSplit(battlerAtk, SPLIT_SPECIAL) + && HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL) && defAbility != ABILITY_CONTRARY && defAbility != ABILITY_CLEAR_BODY && defAbility != ABILITY_FULL_METAL_BODY @@ -1896,7 +1896,7 @@ u16 *GetMovesArray(u32 battler) return gBattleResources->battleHistory->usedMoves[battler]; } -bool32 HasOnlyMovesWithSplit(u32 battlerId, u32 split, bool32 onlyOffensive) +bool32 HasOnlyMovesWithCategory(u32 battlerId, u32 category, bool32 onlyOffensive) { u32 i; u16 *moves = GetMovesArray(battlerId); @@ -1905,21 +1905,21 @@ bool32 HasOnlyMovesWithSplit(u32 battlerId, u32 split, bool32 onlyOffensive) { if (onlyOffensive && IS_MOVE_STATUS(moves[i])) continue; - if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && GetBattleMoveSplit(moves[i]) != split) + if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && GetBattleMoveCategory(moves[i]) != category) return FALSE; } return TRUE; } -bool32 HasMoveWithSplit(u32 battler, u32 split) +bool32 HasMoveWithCategory(u32 battler, u32 category) { u32 i; u16 *moves = GetMovesArray(battler); for (i = 0; i < MAX_MON_MOVES; i++) { - if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && GetBattleMoveSplit(moves[i]) == split) + if (moves[i] != MOVE_NONE && moves[i] != MOVE_UNAVAILABLE && GetBattleMoveCategory(moves[i]) == category) return TRUE; } return FALSE; @@ -2466,11 +2466,11 @@ static bool32 AnyUsefulStatIsRaised(u32 battler) switch (statId) { case STAT_ATK: - if (HasMoveWithSplit(battler, SPLIT_PHYSICAL)) + if (HasMoveWithCategory(battler, BATTLE_CATEGORY_PHYSICAL)) return TRUE; break; case STAT_SPATK: - if (HasMoveWithSplit(battler, SPLIT_SPECIAL)) + if (HasMoveWithCategory(battler, BATTLE_CATEGORY_SPECIAL)) return TRUE; break; case STAT_SPEED: @@ -2773,7 +2773,7 @@ bool32 AI_CanPutToSleep(u32 battlerAtk, u32 battlerDef, u32 defAbility, u32 move static bool32 AI_CanPoisonType(u32 battlerAttacker, u32 battlerTarget, u32 move) { - return ((AI_DATA->abilities[battlerAttacker] == ABILITY_CORROSION && gBattleMoves[move].split == SPLIT_STATUS) + return ((AI_DATA->abilities[battlerAttacker] == ABILITY_CORROSION && gBattleMoves[move].category == BATTLE_CATEGORY_STATUS) || !(IS_BATTLER_OF_TYPE(battlerTarget, TYPE_POISON) || IS_BATTLER_OF_TYPE(battlerTarget, TYPE_STEEL))); } @@ -2801,8 +2801,8 @@ bool32 ShouldPoisonSelf(u32 battler, u32 ability) || ability == ABILITY_POISON_HEAL || ability == ABILITY_QUICK_FEET || ability == ABILITY_MAGIC_GUARD - || (ability == ABILITY_TOXIC_BOOST && HasMoveWithSplit(battler, SPLIT_PHYSICAL)) - || (ability == ABILITY_GUTS && HasMoveWithSplit(battler, SPLIT_PHYSICAL)) + || (ability == ABILITY_TOXIC_BOOST && HasMoveWithCategory(battler, BATTLE_CATEGORY_PHYSICAL)) + || (ability == ABILITY_GUTS && HasMoveWithCategory(battler, BATTLE_CATEGORY_PHYSICAL)) || HasMoveEffect(battler, EFFECT_FACADE) || HasMoveEffect(battler, EFFECT_PSYCHO_SHIFT))) return TRUE; // battler can be poisoned and has move/ability that synergizes with being poisoned @@ -2900,8 +2900,8 @@ bool32 ShouldBurnSelf(u32 battler, u32 ability) ability == ABILITY_QUICK_FEET || ability == ABILITY_HEATPROOF || ability == ABILITY_MAGIC_GUARD - || (ability == ABILITY_FLARE_BOOST && HasMoveWithSplit(battler, SPLIT_SPECIAL)) - || (ability == ABILITY_GUTS && HasMoveWithSplit(battler, SPLIT_PHYSICAL)) + || (ability == ABILITY_FLARE_BOOST && HasMoveWithCategory(battler, BATTLE_CATEGORY_SPECIAL)) + || (ability == ABILITY_GUTS && HasMoveWithCategory(battler, BATTLE_CATEGORY_PHYSICAL)) || HasMoveEffect(battler, EFFECT_FACADE) || HasMoveEffect(battler, EFFECT_PSYCHO_SHIFT))) return TRUE; @@ -3128,13 +3128,13 @@ bool32 ShouldSetScreen(u32 battlerAtk, u32 battlerDef, u32 moveEffect) break; case EFFECT_REFLECT: // Use only if the player has a physical move and AI doesn't already have Reflect itself active. - if (HasMoveWithSplit(battlerDef, SPLIT_PHYSICAL) + if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL) && !(gSideStatuses[atkSide] & SIDE_STATUS_REFLECT)) return TRUE; break; case EFFECT_LIGHT_SCREEN: // Use only if the player has a special move and AI doesn't already have Light Screen itself active. - if (HasMoveWithSplit(battlerDef, SPLIT_SPECIAL) + if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL) && !(gSideStatuses[atkSide] & SIDE_STATUS_LIGHTSCREEN)) return TRUE; break; @@ -3425,7 +3425,7 @@ bool32 IsPartyFullyHealedExceptBattler(u32 battlerId) return TRUE; } -bool32 PartyHasMoveSplit(u32 battlerId, u32 split) +bool32 PartyHasMoveCategory(u32 battlerId, u32 category) { struct Pokemon *party = GetBattlerParty(battlerId); u32 i, j; @@ -3443,7 +3443,7 @@ bool32 PartyHasMoveSplit(u32 battlerId, u32 split) if (pp > 0 && move != MOVE_NONE) { //TODO - handle photon geyser, light that burns the sky - if (gBattleMoves[move].split == split) + if (gBattleMoves[move].category == category) return TRUE; } } @@ -3452,16 +3452,16 @@ bool32 PartyHasMoveSplit(u32 battlerId, u32 split) return FALSE; } -bool32 SideHasMoveSplit(u32 battlerId, u32 split) +bool32 SideHasMoveCategory(u32 battlerId, u32 category) { if (IsDoubleBattle()) { - if (HasMoveWithSplit(battlerId, split) || HasMoveWithSplit(BATTLE_PARTNER(battlerId), split)) + if (HasMoveWithCategory(battlerId, category) || HasMoveWithCategory(BATTLE_PARTNER(battlerId), category)) return TRUE; } else { - if (HasMoveWithSplit(battlerId, split)) + if (HasMoveWithCategory(battlerId, category)) return TRUE; } return FALSE; @@ -3559,7 +3559,7 @@ void IncreaseStatUpScore(u32 battlerAtk, u32 battlerDef, u32 statId, s32 *score) switch (statId) { case STAT_ATK: - if (HasMoveWithSplit(battlerAtk, SPLIT_PHYSICAL) && AI_DATA->hpPercents[battlerAtk] > 40) + if (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_PHYSICAL) && AI_DATA->hpPercents[battlerAtk] > 40) { if (gBattleMons[battlerAtk].statStages[STAT_ATK] < STAT_UP_2_STAGE) ADJUST_SCORE_PTR(2); @@ -3570,7 +3570,7 @@ void IncreaseStatUpScore(u32 battlerAtk, u32 battlerDef, u32 statId, s32 *score) ADJUST_SCORE_PTR(1); break; case STAT_DEF: - if ((HasMoveWithSplit(battlerDef, SPLIT_PHYSICAL)|| IS_MOVE_PHYSICAL(gLastMoves[battlerDef])) + if ((HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)|| IS_MOVE_PHYSICAL(gLastMoves[battlerDef])) && AI_DATA->hpPercents[battlerAtk] > 70) { if (gBattleMons[battlerAtk].statStages[STAT_DEF] < STAT_UP_2_STAGE) @@ -3589,7 +3589,7 @@ void IncreaseStatUpScore(u32 battlerAtk, u32 battlerDef, u32 statId, s32 *score) } break; case STAT_SPATK: - if (HasMoveWithSplit(battlerAtk, SPLIT_SPECIAL) && AI_DATA->hpPercents[battlerAtk] > 40) + if (HasMoveWithCategory(battlerAtk, BATTLE_CATEGORY_SPECIAL) && AI_DATA->hpPercents[battlerAtk] > 40) { if (gBattleMons[battlerAtk].statStages[STAT_SPATK] < STAT_UP_2_STAGE) ADJUST_SCORE_PTR(2); @@ -3598,7 +3598,7 @@ void IncreaseStatUpScore(u32 battlerAtk, u32 battlerDef, u32 statId, s32 *score) } break; case STAT_SPDEF: - if ((HasMoveWithSplit(battlerDef, SPLIT_SPECIAL) || IS_MOVE_SPECIAL(gLastMoves[battlerDef])) + if ((HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL) || IS_MOVE_SPECIAL(gLastMoves[battlerDef])) && AI_DATA->hpPercents[battlerAtk] > 70) { if (gBattleMons[battlerAtk].statStages[STAT_SPDEF] < STAT_UP_2_STAGE) @@ -3658,7 +3658,7 @@ void IncreaseBurnScore(u32 battlerAtk, u32 battlerDef, u32 move, s32 *score) if (AI_CanBurn(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef], BATTLE_PARTNER(battlerAtk), move, AI_DATA->partnerMove)) { ADJUST_SCORE_PTR(1); // burning is good - if (HasMoveWithSplit(battlerDef, SPLIT_PHYSICAL)) + if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_PHYSICAL)) { if (CanTargetFaintAi(battlerDef, battlerAtk)) ADJUST_SCORE_PTR(2); // burning the target to stay alive is cool @@ -3737,7 +3737,7 @@ void IncreaseFrostbiteScore(u32 battlerAtk, u32 battlerDef, u32 move, s32 *score if (AI_CanGiveFrostbite(battlerAtk, battlerDef, AI_DATA->abilities[battlerDef], BATTLE_PARTNER(battlerAtk), move, AI_DATA->partnerMove)) { ADJUST_SCORE_PTR(1); // frostbite is good - if (HasMoveWithSplit(battlerDef, SPLIT_SPECIAL)) + if (HasMoveWithCategory(battlerDef, BATTLE_CATEGORY_SPECIAL)) { if (CanTargetFaintAi(battlerDef, battlerAtk)) ADJUST_SCORE_PTR(2); // frostbiting the target to stay alive is cool diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 43e84f1bff..cf4d094fc3 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -703,7 +703,7 @@ static void HandleInputChooseMove(u32 battler) QueueZMove(battler, chosenMove); gBattleStruct->zmove.viewing = FALSE; - if (gBattleMoves[moveInfo->moves[gMoveSelectionCursor[battler]]].split != SPLIT_STATUS) + if (gBattleMoves[moveInfo->moves[gMoveSelectionCursor[battler]]].category != BATTLE_CATEGORY_STATUS) moveTarget = MOVE_TARGET_SELECTED; //damaging z moves always have selected target } diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index fbbd91ae3f..a44bb3aeb9 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -322,19 +322,19 @@ u16 GetMaxMove(u16 battlerId, u16 baseMove) { return MOVE_STRUGGLE; } - else if (gBattleMoves[baseMove].split == SPLIT_STATUS) + else if (gBattleMoves[baseMove].category == BATTLE_CATEGORY_STATUS) { move = MOVE_MAX_GUARD; } else if (gBattleStruct->dynamicMoveType) { move = GetTypeBasedMaxMove(battlerId, gBattleStruct->dynamicMoveType & DYNAMIC_TYPE_MASK); - gBattleStruct->dynamax.splits[battlerId] = gBattleMoves[baseMove].split; + gBattleStruct->dynamax.categories[battlerId] = gBattleMoves[baseMove].category; } else { move = GetTypeBasedMaxMove(battlerId, gBattleMoves[baseMove].type); - gBattleStruct->dynamax.splits[battlerId] = gBattleMoves[baseMove].split; + gBattleStruct->dynamax.categories[battlerId] = gBattleMoves[baseMove].category; } return move; diff --git a/src/battle_main.c b/src/battle_main.c index 0f708d41ee..3a81c99157 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4673,7 +4673,7 @@ s8 GetMovePriority(u32 battler, u16 move) priority = gBattleMoves[move].priority; // Max Guard check - if (gBattleStruct->dynamax.usingMaxMove[battler] && gBattleMoves[move].split == SPLIT_STATUS) + if (gBattleStruct->dynamax.usingMaxMove[battler] && gBattleMoves[move].category == BATTLE_CATEGORY_STATUS) return gBattleMoves[MOVE_MAX_GUARD].priority; if (ability == ABILITY_GALE_WINGS diff --git a/src/battle_message.c b/src/battle_message.c index d8dbceab24..b5e4db71aa 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2920,7 +2920,7 @@ void BufferStringBattle(u16 stringID, u32 battler) } break; case STRINGID_USEDMOVE: // pokemon used a move msg - if (gBattleStruct->zmove.active && gBattleStruct->zmove.activeSplit != SPLIT_STATUS) + if (gBattleStruct->zmove.active && gBattleStruct->zmove.activeCategory != BATTLE_CATEGORY_STATUS) StringCopy(gBattleTextBuff3, GetZMoveName(gBattleMsgDataPtr->currentMove)); else if (IsMaxMove(gBattleMsgDataPtr->currentMove)) StringCopy(gBattleTextBuff3, GetMaxMoveName(gBattleMsgDataPtr->currentMove)); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 0eef220552..cebbdfb898 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -5568,7 +5568,7 @@ static void Cmd_moveend(void) break; case MOVEEND_NUM_HITS: if (gBattlerAttacker != gBattlerTarget - && gBattleMoves[gCurrentMove].split != SPLIT_STATUS + && gBattleMoves[gCurrentMove].category != BATTLE_CATEGORY_STATUS && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && TARGET_TURN_DAMAGED) { @@ -8128,7 +8128,7 @@ static bool32 HasAttackerFaintedTarget(void) bool32 CanPoisonType(u8 battlerAttacker, u8 battlerTarget) { - return ((GetBattlerAbility(battlerAttacker) == ABILITY_CORROSION && gBattleMoves[gCurrentMove].split == SPLIT_STATUS) + return ((GetBattlerAbility(battlerAttacker) == ABILITY_CORROSION && gBattleMoves[gCurrentMove].category == BATTLE_CATEGORY_STATUS) || !(IS_BATTLER_OF_TYPE(battlerTarget, TYPE_POISON) || IS_BATTLER_OF_TYPE(battlerTarget, TYPE_STEEL))); } @@ -10202,7 +10202,7 @@ static void Cmd_various(void) case VARIOUS_PHOTON_GEYSER_CHECK: { VARIOUS_ARGS(); - gBattleStruct->swapDamageCategory = (GetSplitBasedOnStats(battler) == SPLIT_SPECIAL); + gBattleStruct->swapDamageCategory = (GetCategoryBasedOnStats(battler) == BATTLE_CATEGORY_SPECIAL); break; } case VARIOUS_SHELL_SIDE_ARM_CHECK: // 0% chance GameFreak actually checks this way according to DaWobblefet, but this is the only functional explanation at the moment @@ -15587,7 +15587,7 @@ bool32 IsMoveAffectedByParentalBond(u32 move, u32 battler) { if (move != MOVE_NONE && move != MOVE_UNAVAILABLE && move != MOVE_STRUGGLE && !gBattleMoves[move].parentalBondBanned - && gBattleMoves[move].split != SPLIT_STATUS + && gBattleMoves[move].category != BATTLE_CATEGORY_STATUS && gBattleMoves[move].strikeCount < 2) { if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) diff --git a/src/battle_util.c b/src/battle_util.c index f6132c5116..c348c268f0 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -343,7 +343,7 @@ void HandleAction_UseMove(void) if (gBattleStruct->dynamax.usingMaxMove[gBattlerAttacker]) { gCurrentMove = gChosenMove = GetMaxMove(gBattlerAttacker, gCurrentMove); - gBattleStruct->dynamax.activeSplit = gBattleStruct->dynamax.splits[gBattlerAttacker]; + gBattleStruct->dynamax.activeCategory = gBattleStruct->dynamax.categories[gBattlerAttacker]; } moveTarget = GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove); @@ -3768,14 +3768,14 @@ u8 AtkCanceller_UnableToUseMove(u32 moveType) { //attacker has a queued z move gBattleStruct->zmove.active = TRUE; - gBattleStruct->zmove.activeSplit = gBattleStruct->zmove.splits[gBattlerAttacker]; + gBattleStruct->zmove.activeCategory = gBattleStruct->zmove.categories[gBattlerAttacker]; RecordItemEffectBattle(gBattlerAttacker, HOLD_EFFECT_Z_CRYSTAL); gBattleStruct->zmove.used[gBattlerAttacker] = TRUE; if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsPartnerMonFromSameTrainer(gBattlerAttacker)) gBattleStruct->zmove.used[BATTLE_PARTNER(gBattlerAttacker)] = TRUE; //if 1v1 double, set partner used flag as well gBattleScripting.battler = gBattlerAttacker; - if (gBattleStruct->zmove.activeSplit == SPLIT_STATUS) + if (gBattleStruct->zmove.activeCategory == BATTLE_CATEGORY_STATUS) { gBattleStruct->zmove.effect = gBattleMoves[gBattleStruct->zmove.baseMoves[gBattlerAttacker]].zMove.effect; BattleScriptPushCursor(); @@ -6663,13 +6663,13 @@ static u8 TrySetEnigmaBerry(u32 battler) return 0; } -static u8 DamagedStatBoostBerryEffect(u32 battler, u8 statId, u8 split) +static u8 DamagedStatBoostBerryEffect(u32 battler, u8 statId, u8 category) { if (IsBattlerAlive(battler) && CompareStat(battler, statId, MAX_STAT_STAGE, CMP_LESS_THAN) && (gBattleScripting.overrideBerryRequirements || (!DoesSubstituteBlockMove(gBattlerAttacker, battler, gCurrentMove) - && GetBattleMoveSplit(gCurrentMove) == split + && GetBattleMoveCategory(gCurrentMove) == category && TARGET_TURN_DAMAGED)) ) { @@ -6944,11 +6944,11 @@ static u8 ItemEffectMoveEnd(u32 battler, u16 holdEffect) break; case HOLD_EFFECT_KEE_BERRY: // consume and boost defense if used physical move if (B_BERRIES_INSTANT >= GEN_4) - effect = DamagedStatBoostBerryEffect(battler, STAT_DEF, SPLIT_PHYSICAL); + effect = DamagedStatBoostBerryEffect(battler, STAT_DEF, BATTLE_CATEGORY_PHYSICAL); break; case HOLD_EFFECT_MARANGA_BERRY: // consume and boost sp. defense if used special move if (B_BERRIES_INSTANT >= GEN_4) - effect = DamagedStatBoostBerryEffect(battler, STAT_SPDEF, SPLIT_SPECIAL); + effect = DamagedStatBoostBerryEffect(battler, STAT_SPDEF, BATTLE_CATEGORY_SPECIAL); break; case HOLD_EFFECT_RANDOM_STAT_UP: if (B_BERRIES_INSTANT >= GEN_4) @@ -7928,10 +7928,10 @@ u8 ItemBattleEffects(u8 caseID, u32 battler, bool32 moveTurn) } break; case HOLD_EFFECT_KEE_BERRY: // consume and boost defense if used physical move - effect = DamagedStatBoostBerryEffect(battler, STAT_DEF, SPLIT_PHYSICAL); + effect = DamagedStatBoostBerryEffect(battler, STAT_DEF, BATTLE_CATEGORY_PHYSICAL); break; case HOLD_EFFECT_MARANGA_BERRY: // consume and boost sp. defense if used special move - effect = DamagedStatBoostBerryEffect(battler, STAT_SPDEF, SPLIT_SPECIAL); + effect = DamagedStatBoostBerryEffect(battler, STAT_SPDEF, BATTLE_CATEGORY_SPECIAL); break; case HOLD_EFFECT_STICKY_BARB: if (TARGET_TURN_DAMAGED @@ -10065,7 +10065,7 @@ static inline uq4_12_t CalcTypeEffectivenessMultiplierInternal(u32 move, u32 mov if (recordAbilities && (illusionSpecies = GetIllusionMonSpecies(battlerDef))) TryNoticeIllusionInTypeEffectiveness(move, moveType, battlerAtk, battlerDef, modifier, illusionSpecies); - if (gBattleMoves[move].split == SPLIT_STATUS && move != MOVE_THUNDER_WAVE) + if (gBattleMoves[move].category == BATTLE_CATEGORY_STATUS && move != MOVE_THUNDER_WAVE) { modifier = UQ_4_12(1.0); if (B_GLARE_GHOST < GEN_4 && move == MOVE_GLARE && IS_BATTLER_OF_TYPE(battlerDef, TYPE_GHOST)) @@ -10697,23 +10697,23 @@ bool32 ShouldGetStatBadgeBoost(u16 badgeFlag, u32 battler) return FALSE; } -u8 GetBattleMoveSplit(u32 moveId) +u8 GetBattleMoveCategory(u32 moveId) { if (gBattleStruct != NULL && gBattleStruct->zmove.active && !IS_MOVE_STATUS(moveId)) - return gBattleStruct->zmove.activeSplit; + return gBattleStruct->zmove.activeCategory; if (gBattleStruct != NULL && IsMaxMove(moveId)) // TODO: Might be buggy depending on when this is called. - return gBattleStruct->dynamax.activeSplit; + return gBattleStruct->dynamax.activeCategory; if (gBattleStruct != NULL && gBattleStruct->swapDamageCategory) // Photon Geyser, Shell Side Arm, Light That Burns the Sky - return SPLIT_PHYSICAL; + return BATTLE_CATEGORY_PHYSICAL; if (B_PHYSICAL_SPECIAL_SPLIT >= GEN_4) - return gBattleMoves[moveId].split; + return gBattleMoves[moveId].category; if (IS_MOVE_STATUS(moveId)) - return SPLIT_STATUS; + return BATTLE_CATEGORY_STATUS; else if (gBattleMoves[moveId].type < TYPE_MYSTERY) - return SPLIT_PHYSICAL; + return BATTLE_CATEGORY_PHYSICAL; else - return SPLIT_SPECIAL; + return BATTLE_CATEGORY_SPECIAL; } static bool32 TryRemoveScreens(u32 battler) @@ -10755,7 +10755,7 @@ static bool32 IsUnnerveAbilityOnOpposingSide(u32 battler) } // Photon geyser & light that burns the sky -u8 GetSplitBasedOnStats(u32 battler) +u8 GetCategoryBasedOnStats(u32 battler) { u32 attack = gBattleMons[battler].attack; u32 spAttack = gBattleMons[battler].spAttack; @@ -10767,9 +10767,9 @@ u8 GetSplitBasedOnStats(u32 battler) spAttack = spAttack / gStatStageRatios[gBattleMons[battler].statStages[STAT_SPATK]][1]; if (spAttack >= attack) - return SPLIT_SPECIAL; + return BATTLE_CATEGORY_SPECIAL; else - return SPLIT_PHYSICAL; + return BATTLE_CATEGORY_PHYSICAL; } static u32 GetFlingPowerFromItemId(u32 itemId) diff --git a/src/battle_z_move.c b/src/battle_z_move.c index 91911a02c2..a7bdb7a481 100644 --- a/src/battle_z_move.c +++ b/src/battle_z_move.c @@ -149,9 +149,9 @@ void QueueZMove(u8 battler, u16 baseMove) gBattleStruct->zmove.toBeUsed[battler] = gBattleStruct->zmove.chosenZMove; gBattleStruct->zmove.baseMoves[battler] = baseMove; if (gBattleStruct->zmove.chosenZMove == MOVE_LIGHT_THAT_BURNS_THE_SKY) - gBattleStruct->zmove.splits[battler] = GetSplitBasedOnStats(battler); + gBattleStruct->zmove.categories[battler] = GetCategoryBasedOnStats(battler); else - gBattleStruct->zmove.splits[battler] = gBattleMoves[baseMove].split; + gBattleStruct->zmove.categories[battler] = gBattleMoves[baseMove].category; } bool32 IsViableZMove(u8 battler, u16 move) @@ -518,7 +518,7 @@ static void ZMoveSelectionDisplayPower(u16 move, u16 zMove) if (zMove >= MOVE_CATASTROPIKA) power = gBattleMoves[zMove].power; - if (gBattleMoves[move].split != SPLIT_STATUS) + if (gBattleMoves[move].category != BATTLE_CATEGORY_STATUS) { txtPtr = StringCopy(gDisplayedStringBattle, sText_PowerColon); ConvertIntToDecimalStringN(txtPtr, power, STR_CONV_MODE_LEFT_ALIGN, 3); @@ -687,7 +687,7 @@ static bool32 AreStatsMaxed(u8 battler, u8 n) u16 GetZMovePower(u16 move) { - if (gBattleMoves[move].split == SPLIT_STATUS) + if (gBattleMoves[move].category == BATTLE_CATEGORY_STATUS) return 0; if (gBattleMoves[move].effect == EFFECT_OHKO) return 180; diff --git a/src/data/battle_moves.h b/src/data/battle_moves.h index c52a78dbf8..b29ce710e3 100644 --- a/src/data/battle_moves.h +++ b/src/data/battle_moves.h @@ -10,7 +10,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, .mirrorMoveBanned = TRUE, }, @@ -25,7 +25,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS == GEN_4, }, @@ -41,7 +41,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -55,7 +55,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -69,7 +69,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -84,7 +84,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -99,7 +99,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_FIRE_PUNCH] = @@ -112,7 +112,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -132,7 +132,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -148,7 +148,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -164,7 +164,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -178,7 +178,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -192,7 +192,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -207,7 +207,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .critBoost = 1, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -228,7 +228,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, @@ -244,7 +244,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -259,7 +259,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_4) || (B_UPDATED_MOVE_FLAGS < GEN_3), .damagesAirborneDoubleDamage = TRUE, .windMove = TRUE, @@ -275,7 +275,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -293,7 +293,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = -6, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .windMove = TRUE, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -317,7 +317,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .gravityBanned = TRUE, @@ -340,7 +340,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, }, @@ -355,7 +355,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = TRUE, }, @@ -378,7 +378,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -392,7 +392,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = TRUE, @@ -409,7 +409,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, }, @@ -424,7 +424,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -446,7 +446,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .gravityBanned = TRUE, }, @@ -461,7 +461,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .sheerForceBoost = TRUE, @@ -477,7 +477,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, }, @@ -492,7 +492,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -507,7 +507,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -521,7 +521,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -535,7 +535,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -557,7 +557,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -571,7 +571,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -592,7 +592,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -607,7 +607,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -626,7 +626,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .instructBanned = TRUE, }, @@ -642,7 +642,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -656,7 +656,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -671,7 +671,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -685,7 +685,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .strikeCount = 2, @@ -706,7 +706,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_LEER] = @@ -719,7 +719,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -734,7 +734,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -750,7 +750,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .soundMove = TRUE, @@ -771,7 +771,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = -6, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -791,7 +791,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -808,7 +808,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -825,7 +825,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_DISABLE] = @@ -844,7 +844,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -864,7 +864,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -878,7 +878,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -896,7 +896,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -910,7 +910,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -927,7 +927,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_HYDRO_PUMP] = @@ -944,7 +944,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SURF] = @@ -965,7 +965,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 15, .secondaryEffectChance = 0, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .damagesUnderwater = TRUE, .skyBattleBanned = TRUE, }, @@ -990,7 +990,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -1012,7 +1012,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -1027,7 +1027,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -1041,7 +1041,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -1055,7 +1055,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -1069,7 +1069,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, }, @@ -1083,7 +1083,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -1097,7 +1097,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -1116,7 +1116,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -1130,7 +1130,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -1144,7 +1144,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = -5, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .meFirstBanned = TRUE, @@ -1163,7 +1163,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = TRUE, }, @@ -1178,7 +1178,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -1196,7 +1196,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -1215,7 +1215,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -1230,7 +1230,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, }, @@ -1253,7 +1253,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1271,7 +1271,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .slicingMove = TRUE, }, @@ -1285,7 +1285,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -1301,7 +1301,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -1317,7 +1317,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -1333,7 +1333,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -1357,7 +1357,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, .danceMove = TRUE, .instructBanned = TRUE, @@ -1377,7 +1377,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1392,7 +1392,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = (B_UPDATED_MOVE_FLAGS == GEN_4) || (B_UPDATED_MOVE_FLAGS < GEN_3), }, @@ -1411,7 +1411,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, }, @@ -1425,7 +1425,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -1443,7 +1443,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -1461,7 +1461,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1480,7 +1480,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .damagesAirborne = TRUE, }, @@ -1495,7 +1495,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_EARTHQUAKE] = @@ -1508,7 +1508,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, @@ -1524,7 +1524,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, }, @@ -1543,7 +1543,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, @@ -1566,7 +1566,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1581,7 +1581,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -1595,7 +1595,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -1609,7 +1609,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1624,7 +1624,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1641,7 +1641,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1658,7 +1658,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -1672,7 +1672,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -1686,7 +1686,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = -6, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1702,7 +1702,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_MIMIC] = @@ -1715,7 +1715,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresSubstitute = TRUE, .mimicBanned = TRUE, @@ -1737,7 +1737,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -1754,7 +1754,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1777,7 +1777,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1795,7 +1795,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1816,7 +1816,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1833,7 +1833,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1848,7 +1848,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -1863,7 +1863,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1880,7 +1880,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1901,7 +1901,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1918,7 +1918,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1935,7 +1935,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -1952,7 +1952,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1969,7 +1969,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -1991,7 +1991,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 10, .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sleepTalkBanned = TRUE, .instructBanned = TRUE, @@ -2008,7 +2008,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .mimicBanned = TRUE, @@ -2030,7 +2030,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_2 }, .mimicBanned = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, @@ -2051,7 +2051,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, }, @@ -2065,7 +2065,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, }, @@ -2083,7 +2083,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -2102,7 +2102,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -2116,7 +2116,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -2130,7 +2130,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -2148,7 +2148,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -2166,7 +2166,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -2186,7 +2186,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, }, @@ -2201,7 +2201,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SKULL_BASH] = @@ -2219,7 +2219,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, @@ -2236,7 +2236,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_CONSTRICT] = @@ -2249,7 +2249,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -2264,7 +2264,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2281,7 +2281,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -2300,7 +2300,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .ignoresProtect = TRUE, @@ -2326,7 +2326,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .gravityBanned = TRUE, }, @@ -2347,7 +2347,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -2362,7 +2362,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -2384,7 +2384,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 40, .secondaryEffectChance = 0, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -2399,7 +2399,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, }, @@ -2418,7 +2418,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, @@ -2434,7 +2434,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -2449,7 +2449,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MOVE_EFFECT_FLINCH, .twoTurnMove = TRUE, .sheerForceBoost = TRUE, @@ -2467,7 +2467,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2493,7 +2493,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -2507,7 +2507,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -2523,7 +2523,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -2543,7 +2543,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .magicCoatAffected = TRUE, }, @@ -2562,7 +2562,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SPLASH] = @@ -2575,7 +2575,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_3 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -2596,7 +2596,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -2622,7 +2622,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -2636,7 +2636,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, }, @@ -2650,7 +2650,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -2664,7 +2664,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .strikeCount = 2, }, @@ -2682,7 +2682,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -2700,7 +2700,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -2714,7 +2714,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -2730,7 +2730,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -2747,7 +2747,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -2764,7 +2764,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -2778,7 +2778,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 }, @@ -2794,7 +2794,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -2809,7 +2809,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -2833,7 +2833,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .meFirstBanned = TRUE, @@ -2856,7 +2856,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -2880,7 +2880,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, }, @@ -2900,7 +2900,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .meFirstBanned = TRUE, @@ -2919,7 +2919,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, @@ -2939,7 +2939,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, }, @@ -2957,7 +2957,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS <= GEN_3, }, @@ -2972,7 +2972,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .thawsUser = TRUE, @@ -2992,7 +2992,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .sheerForceBoost = TRUE, .soundMove = TRUE, @@ -3013,7 +3013,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_CURSE }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -3030,7 +3030,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -3044,7 +3044,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, @@ -3062,7 +3062,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_COTTON_SPORE] = @@ -3083,7 +3083,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 40, .secondaryEffectChance = 0, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -3099,7 +3099,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -3113,7 +3113,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, @@ -3133,7 +3133,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -3151,7 +3151,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 10, .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .protectionMove = TRUE, .metronomeBanned = TRUE, @@ -3169,7 +3169,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -3188,7 +3188,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -3206,7 +3206,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_SWEET_KISS] = @@ -3223,7 +3223,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -3238,7 +3238,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -3255,7 +3255,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -3270,7 +3270,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -3284,7 +3284,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -3299,7 +3299,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3322,7 +3322,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -3341,7 +3341,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresSubstitute = TRUE, @@ -3357,7 +3357,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_FOLLOW_ME }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -3377,7 +3377,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -3395,7 +3395,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -3414,7 +3414,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 5, .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3438,7 +3438,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_LOCK_ON] = @@ -3455,7 +3455,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, }, @@ -3477,7 +3477,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .instructBanned = TRUE, }, @@ -3492,7 +3492,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3517,7 +3517,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -3536,7 +3536,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 10, .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3560,7 +3560,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -3575,7 +3575,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .instructBanned = TRUE, .parentalBondBanned = TRUE, @@ -3591,7 +3591,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -3609,7 +3609,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, }, @@ -3628,7 +3628,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, @@ -3646,7 +3646,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -3667,7 +3667,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -3682,7 +3682,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -3697,7 +3697,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, @@ -3713,7 +3713,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .ignoresSubstitute = TRUE, @@ -3729,7 +3729,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3752,7 +3752,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -3771,7 +3771,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -3785,7 +3785,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 }, @@ -3799,7 +3799,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -3813,7 +3813,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -3830,7 +3830,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, }, @@ -3844,7 +3844,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .thawsUser = TRUE, }, @@ -3859,7 +3859,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .damagesUnderground = TRUE, .skyBattleBanned = TRUE, }, @@ -3874,7 +3874,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -3890,7 +3890,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -3904,7 +3904,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_3, }, @@ -3919,7 +3919,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -3935,7 +3935,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .encoreBanned = TRUE, @@ -3952,7 +3952,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresKingsRock = B_UPDATED_MOVE_FLAGS < GEN_5, // && B_UPDATED_MOVE_FLAGS > GEN_2 }, @@ -3971,7 +3971,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -3989,7 +3989,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .magicCoatAffected = TRUE, }, @@ -4004,7 +4004,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -4019,7 +4019,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -4034,7 +4034,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = -1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -4048,7 +4048,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, @@ -4066,7 +4066,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, @@ -4088,7 +4088,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, @@ -4106,7 +4106,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_CROSS_CHOP] = @@ -4120,7 +4120,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -4134,7 +4134,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .damagesAirborneDoubleDamage = TRUE, .windMove = TRUE, @@ -4150,7 +4150,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4166,7 +4166,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4186,7 +4186,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -4202,7 +4202,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = -5, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -4219,7 +4219,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -4241,7 +4241,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 5, .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -4258,7 +4258,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -4272,7 +4272,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -4297,7 +4297,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -4316,7 +4316,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -4336,7 +4336,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .damagesUnderwater = TRUE, }, @@ -4354,7 +4354,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_FAKE_OUT] = @@ -4375,7 +4375,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 10, .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -4393,7 +4393,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, .sleepTalkBanned = TRUE, @@ -4414,7 +4414,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -4435,7 +4435,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, }, @@ -4449,7 +4449,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, @@ -4471,7 +4471,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -4486,7 +4486,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4502,7 +4502,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -4517,7 +4517,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -4536,7 +4536,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -4551,7 +4551,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESTORE_REPLACEMENT_HP }, }, @@ -4565,7 +4565,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -4579,7 +4579,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = -3, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .mirrorMoveBanned = TRUE, .punchingMove = TRUE, @@ -4605,7 +4605,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = STATUS1_PARALYSIS, .makesContact = TRUE, }, @@ -4624,7 +4624,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 20, .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4643,7 +4643,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, .copycatBanned = TRUE, .sleepTalkBanned = TRUE, @@ -4663,7 +4663,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -4680,7 +4680,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -4700,7 +4700,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 20, .secondaryEffectChance = 0, .priority = 5, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -4720,7 +4720,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -4737,7 +4737,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -4754,7 +4754,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .healBlockBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -4772,7 +4772,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_4, @@ -4794,7 +4794,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -4812,7 +4812,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -4826,7 +4826,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = 4, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -4842,7 +4842,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -4859,7 +4859,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = -4, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -4873,7 +4873,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -4887,7 +4887,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -4906,7 +4906,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -4920,7 +4920,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .parentalBondBanned = TRUE, }, @@ -4935,7 +4935,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SKILL_SWAP] = @@ -4948,7 +4948,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, }, @@ -4963,7 +4963,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -4982,7 +4982,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -4999,7 +4999,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_FOLLOW_ME }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -5016,7 +5016,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = 4, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresSubstitute = TRUE, .forcePressure = TRUE, @@ -5035,7 +5035,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -5053,7 +5053,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .sleepTalkBanned = TRUE, @@ -5072,7 +5072,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -5086,7 +5086,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -5107,7 +5107,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -5124,7 +5124,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -5138,7 +5138,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -5153,7 +5153,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .danceMove = TRUE, @@ -5169,7 +5169,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .danceMove = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_4, @@ -5186,7 +5186,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -5201,7 +5201,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -5218,7 +5218,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ballisticMove = TRUE, .instructBanned = TRUE, @@ -5235,7 +5235,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, @@ -5255,7 +5255,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, @@ -5273,7 +5273,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, }, @@ -5292,7 +5292,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 15, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -5308,7 +5308,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -5323,7 +5323,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_HYDRO_CANNON] = @@ -5336,7 +5336,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_METEOR_MASH] = @@ -5354,7 +5354,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -5370,7 +5370,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, @@ -5386,7 +5386,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ballisticMove = TRUE, }, @@ -5400,7 +5400,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -5417,7 +5417,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -5437,7 +5437,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_BOTH, .priority = 0, .critBoost = 1, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .windMove = TRUE, .slicingMove = TRUE, }, @@ -5459,7 +5459,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_ODOR_SLEUTH] = @@ -5476,7 +5476,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -5498,7 +5498,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -5512,7 +5512,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -5527,7 +5527,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -5544,7 +5544,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -5561,7 +5561,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -5576,7 +5576,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -5593,7 +5593,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SIGNAL_BEAM] = @@ -5606,7 +5606,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -5620,7 +5620,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -5639,7 +5639,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS < GEN_4, }, @@ -5654,7 +5654,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .damagesAirborne = TRUE, @@ -5675,7 +5675,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_SHEER_COLD] = @@ -5688,7 +5688,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_MUDDY_WATER] = @@ -5705,7 +5705,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .skyBattleBanned = TRUE, }, @@ -5724,7 +5724,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, }, @@ -5738,7 +5738,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -5757,7 +5757,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_IRON_DEFENSE] = @@ -5770,7 +5770,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -5787,7 +5787,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = (B_UPDATED_MOVE_FLAGS >= GEN_6) || (B_UPDATED_MOVE_FLAGS <= GEN_3), .magicCoatAffected = TRUE, @@ -5807,7 +5807,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -5825,7 +5825,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -5839,7 +5839,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, }, @@ -5853,7 +5853,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -5870,7 +5870,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MOVE_EFFECT_PARALYSIS, .twoTurnMove = TRUE, .makesContact = TRUE, @@ -5891,7 +5891,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -5906,7 +5906,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -5935,7 +5935,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .meFirstBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -5956,7 +5956,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -5971,7 +5971,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_WATER_SPORT] = @@ -5984,7 +5984,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6001,7 +6001,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -6023,7 +6023,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -6038,7 +6038,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, @@ -6060,7 +6060,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = B_UPDATED_MOVE_FLAGS >= GEN_6, }, @@ -6074,7 +6074,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_WATER_PULSE] = @@ -6087,7 +6087,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .pulseMove = TRUE, }, @@ -6107,7 +6107,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, }, @@ -6122,7 +6122,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_ROOST] = @@ -6139,7 +6139,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, @@ -6157,7 +6157,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6174,7 +6174,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -6194,7 +6194,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = STATUS1_SLEEP, .makesContact = TRUE, }, @@ -6209,7 +6209,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -6224,7 +6224,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ballisticMove = TRUE, }, @@ -6239,7 +6239,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .healBlockBanned = TRUE, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -6256,7 +6256,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_NATURAL_GIFT] = @@ -6269,7 +6269,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_FEINT] = @@ -6286,7 +6286,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 2, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ignoresProtect = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_6, .metronomeBanned = TRUE, @@ -6304,7 +6304,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -6322,7 +6322,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .snatchAffected = TRUE, .windMove = TRUE, @@ -6340,7 +6340,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER | MOVE_TARGET_ALLY, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6357,7 +6357,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .meFirstBanned = TRUE, }, @@ -6371,7 +6371,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -6385,7 +6385,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -6399,7 +6399,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -6417,7 +6417,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -6431,7 +6431,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -6446,7 +6446,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .parentalBondBanned = TRUE, }, @@ -6464,7 +6464,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_2 }, }, @@ -6478,7 +6478,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, }, @@ -6492,7 +6492,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_2 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, }, @@ -6507,7 +6507,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, }, @@ -6521,7 +6521,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -6538,7 +6538,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -6553,7 +6553,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -6570,7 +6570,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, @@ -6594,7 +6594,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6617,7 +6617,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, }, @@ -6632,7 +6632,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, }, @@ -6647,7 +6647,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -6665,7 +6665,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -6679,7 +6679,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -6698,7 +6698,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -6712,7 +6712,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -6731,7 +6731,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_BOOST_CRITS }, .ignoresSubstitute = TRUE, }, @@ -6746,7 +6746,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -6763,7 +6763,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_EVSN_UP_1 }, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -6782,7 +6782,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = STATUS1_BURN, .makesContact = TRUE, .sheerForceBoost = TRUE, @@ -6799,7 +6799,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -6818,7 +6818,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, .ballisticMove = TRUE, }, @@ -6833,7 +6833,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -6850,7 +6850,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -6865,7 +6865,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .pulseMove = TRUE, }, @@ -6881,7 +6881,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -6896,7 +6896,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -6910,7 +6910,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, }, @@ -6928,7 +6928,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .slicingMove = TRUE, }, @@ -6943,7 +6943,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -6958,7 +6958,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -6978,7 +6978,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, }, @@ -6992,7 +6992,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -7012,7 +7012,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_DRAIN_PUNCH] = @@ -7030,7 +7030,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, @@ -7046,7 +7046,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_FOCUS_BLAST] = @@ -7059,7 +7059,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -7078,7 +7078,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -7094,7 +7094,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7108,7 +7108,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .skyBattleBanned = TRUE, }, @@ -7123,7 +7123,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -7140,7 +7140,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7154,7 +7154,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -7171,7 +7171,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -7186,7 +7186,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = -4, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7200,7 +7200,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_SHADOW_CLAW] = @@ -7214,7 +7214,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7228,7 +7228,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = STATUS1_PARALYSIS, .makesContact = TRUE, .sheerForceBoost = TRUE, @@ -7250,7 +7250,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .bitingMove = TRUE, @@ -7266,7 +7266,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = STATUS1_BURN, .makesContact = TRUE, .sheerForceBoost = TRUE, @@ -7283,7 +7283,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7297,7 +7297,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -7313,7 +7313,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .slicingMove = TRUE, }, @@ -7327,7 +7327,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -7342,7 +7342,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -7356,7 +7356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -7370,7 +7370,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -7385,7 +7385,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, //.ignoresSubstitute = TRUE, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, @@ -7401,7 +7401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = -7, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ACC_UP_1 }, .ignoresProtect = TRUE, }, @@ -7420,7 +7420,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_DISCHARGE] = @@ -7433,7 +7433,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -7447,7 +7447,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -7465,7 +7465,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_POWER_WHIP] = @@ -7478,7 +7478,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7492,7 +7492,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, }, @@ -7507,7 +7507,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .slicingMove = TRUE, @@ -7527,7 +7527,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -7541,7 +7541,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -7556,7 +7556,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ballisticMove = TRUE, }, @@ -7571,7 +7571,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_CAPTIVATE] = @@ -7584,7 +7584,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .magicCoatAffected = TRUE, }, @@ -7599,7 +7599,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, @@ -7617,7 +7617,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, .skyBattleBanned = TRUE, }, @@ -7640,7 +7640,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, @@ -7663,7 +7663,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .argument = HOLD_EFFECT_PLATE, }, @@ -7677,7 +7677,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7691,7 +7691,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 70, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -7706,7 +7706,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7720,7 +7720,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7735,7 +7735,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_DEFEND_ORDER] = @@ -7748,7 +7748,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -7765,7 +7765,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, @@ -7784,7 +7784,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7798,7 +7798,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, }, @@ -7813,7 +7813,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SPACIAL_REND] = @@ -7827,7 +7827,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_LUNAR_DANCE] = @@ -7840,7 +7840,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .snatchAffected = B_UPDATED_MOVE_FLAGS >= GEN_5, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -7858,7 +7858,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -7880,7 +7880,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_DARK_VOID] = @@ -7897,7 +7897,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, }, @@ -7912,7 +7912,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -7926,7 +7926,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -7941,7 +7941,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .argument = MOVE_EFFECT_FEINT, .twoTurnMove = TRUE, @@ -7962,7 +7962,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -7979,7 +7979,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 3, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .argument = TRUE, // Protects the whole side. .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, @@ -7999,7 +7999,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .mirrorMoveBanned = TRUE, }, @@ -8014,7 +8014,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .mirrorMoveBanned = TRUE, }, @@ -8033,7 +8033,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 10, .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, }, @@ -8048,7 +8048,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_VENOSHOCK] = @@ -8061,7 +8061,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_AUTOTOMIZE] = @@ -8074,7 +8074,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8095,7 +8095,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 20, .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .powderMove = TRUE, .ignoresProtect = TRUE, @@ -8115,7 +8115,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, .gravityBanned = TRUE, @@ -8135,7 +8135,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 10, .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, }, @@ -8150,7 +8150,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .damagesAirborne = TRUE, .skyBattleBanned = TRUE, }, @@ -8170,7 +8170,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = ALWAYS_CRIT, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -8184,7 +8184,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SLUDGE_WAVE] = @@ -8197,7 +8197,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -8211,7 +8211,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .danceMove = TRUE, .snatchAffected = TRUE, @@ -8229,7 +8229,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_7, .skyBattleBanned = TRUE, @@ -8250,7 +8250,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_ELECTRO_BALL] = @@ -8263,7 +8263,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ballisticMove = TRUE, }, @@ -8277,7 +8277,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -8292,7 +8292,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -8307,7 +8307,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8328,7 +8328,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -8343,7 +8343,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -8358,7 +8358,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -8372,7 +8372,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -8387,7 +8387,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -8402,7 +8402,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -8420,7 +8420,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -8435,7 +8435,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -8450,7 +8450,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, }, @@ -8465,7 +8465,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_STORED_POWER] = @@ -8478,7 +8478,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_QUICK_GUARD] = @@ -8491,7 +8491,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 3, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .argument = TRUE, // Protects the whole side. .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, @@ -8515,7 +8515,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .pp = 15, .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -8531,7 +8531,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .thawsUser = TRUE, }, @@ -8546,7 +8546,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8563,7 +8563,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .magicCoatAffected = TRUE, .mirrorMoveBanned = TRUE, @@ -8585,7 +8585,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SKY_DROP] = @@ -8598,7 +8598,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .gravityBanned = TRUE, @@ -8617,7 +8617,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8634,7 +8634,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = -6, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, @@ -8654,7 +8654,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_QUASH] = @@ -8667,7 +8667,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .metronomeBanned = TRUE, }, @@ -8682,7 +8682,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -8696,7 +8696,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -8712,7 +8712,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -8726,7 +8726,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .parentalBondBanned = TRUE, }, @@ -8741,7 +8741,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_2 }, .ignoresProtect = B_UPDATED_MOVE_FLAGS >= GEN_6, .ignoresSubstitute = TRUE, @@ -8760,7 +8760,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -8778,7 +8778,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, }, @@ -8796,7 +8796,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, }, @@ -8814,7 +8814,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .skyBattleBanned = TRUE, }, @@ -8828,7 +8828,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_STRUGGLE_BUG] = @@ -8845,7 +8845,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -8859,7 +8859,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .skyBattleBanned = TRUE, }, @@ -8879,7 +8879,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = ALWAYS_CRIT, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_DRAGON_TAIL] = @@ -8892,7 +8892,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = -6, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .copycatBanned = TRUE, .assistBanned = TRUE, @@ -8908,7 +8908,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -8925,7 +8925,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -8940,7 +8940,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -8955,7 +8955,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -8969,7 +8969,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, }, @@ -8984,7 +8984,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -8999,7 +8999,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -9018,7 +9018,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, .slicingMove = TRUE, @@ -9034,7 +9034,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .slicingMove = TRUE, @@ -9050,7 +9050,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .minimizeDoubleDamage = B_UPDATED_MOVE_FLAGS >= GEN_6, }, @@ -9065,7 +9065,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, //.windMove = TRUE, }, @@ -9080,7 +9080,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .minimizeDoubleDamage = TRUE, @@ -9096,7 +9096,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -9113,7 +9113,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 40, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -9127,7 +9127,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_TAIL_SLAP] = @@ -9140,7 +9140,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -9158,7 +9158,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, .damagesAirborne = TRUE, @@ -9175,7 +9175,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -9189,7 +9189,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, }, @@ -9204,7 +9204,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ballisticMove = TRUE, }, @@ -9223,7 +9223,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .argument = HOLD_EFFECT_DRIVE, .metronomeBanned = TRUE, }, @@ -9238,7 +9238,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .argument = STATUS1_SLEEP, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -9256,7 +9256,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .slicingMove = TRUE, .metronomeBanned = TRUE, }, @@ -9271,7 +9271,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -9285,7 +9285,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -9300,7 +9300,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -9314,7 +9314,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .danceMove = TRUE, }, @@ -9329,7 +9329,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MOVE_EFFECT_PARALYSIS, .twoTurnMove = TRUE, .sheerForceBoost = TRUE, @@ -9348,7 +9348,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .argument = MOVE_EFFECT_BURN, .twoTurnMove = TRUE, .sheerForceBoost = TRUE, @@ -9367,7 +9367,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, @@ -9384,7 +9384,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -9398,7 +9398,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -9413,7 +9413,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .thawsUser = TRUE, }, @@ -9427,7 +9427,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_FLYING_PRESS] = @@ -9444,7 +9444,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = TYPE_FLYING, .makesContact = TRUE, .minimizeDoubleDamage = TRUE, @@ -9462,7 +9462,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .argument = TRUE, // Protects the whole side. .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .snatchAffected = TRUE, @@ -9484,7 +9484,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -9505,7 +9505,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -9522,7 +9522,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_OPPONENTS_FIELD, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -9544,7 +9544,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -9558,7 +9558,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MOVE_EFFECT_FEINT, .twoTurnMove = TRUE, .ignoresProtect = TRUE, @@ -9579,7 +9579,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .argument = TYPE_GHOST, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .magicCoatAffected = TRUE, @@ -9595,7 +9595,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .magicCoatAffected = TRUE, @@ -9612,7 +9612,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 1, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -9632,7 +9632,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -9646,7 +9646,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .argument = TYPE_GRASS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .magicCoatAffected = TRUE, @@ -9662,7 +9662,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .windMove = TRUE, }, @@ -9676,7 +9676,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -9690,7 +9690,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -9705,7 +9705,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESTORE_REPLACEMENT_HP }, .magicCoatAffected = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -9726,7 +9726,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .magicCoatAffected = TRUE, }, @@ -9741,7 +9741,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .argument = 75, // restores 75% HP instead of 50% HP .makesContact = TRUE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, @@ -9757,7 +9757,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 3, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .argument = TRUE, // Protects the whole side. .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, @@ -9775,7 +9775,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -9791,7 +9791,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -9808,7 +9808,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -9825,7 +9825,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, }, @@ -9839,7 +9839,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -9854,7 +9854,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .windMove = TRUE, }, @@ -9868,7 +9868,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -9882,7 +9882,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -9897,7 +9897,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -9913,7 +9913,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 4, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .protectionMove = TRUE, .ignoresProtect = TRUE, @@ -9934,7 +9934,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -9951,7 +9951,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .ignoresProtect = TRUE, .magicCoatAffected = TRUE, @@ -9973,7 +9973,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -9988,7 +9988,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .thawsUser = TRUE, .metronomeBanned = TRUE, @@ -10004,7 +10004,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, @@ -10013,9 +10013,9 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = [MOVE_WATER_SHURIKEN] = { #if B_UPDATED_MOVE_DATA >= GEN_7 - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, #else - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, #endif .effect = EFFECT_MULTI_HIT, .power = 15, @@ -10042,7 +10042,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -10056,7 +10056,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 4, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .protectionMove = TRUE, .ignoresProtect = TRUE, @@ -10076,7 +10076,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALLY, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -10093,7 +10093,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -10108,7 +10108,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -10123,7 +10123,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_2 }, .powderMove = TRUE, .magicCoatAffected = TRUE, @@ -10139,7 +10139,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .twoTurnMove = TRUE, .sleepTalkBanned = TRUE, @@ -10157,7 +10157,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -10175,7 +10175,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -10191,7 +10191,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -10208,7 +10208,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_CELEBRATE] = @@ -10221,7 +10221,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -10243,7 +10243,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALLY, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -10265,7 +10265,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, }, @@ -10280,7 +10280,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -10295,7 +10295,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -10309,7 +10309,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, }, @@ -10323,7 +10323,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -10339,7 +10339,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .argument = 75, // restores 75% HP instead of 50% HP .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, }, @@ -10354,7 +10354,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .damagesAirborne = TRUE, .ignoreTypeIfFlyingAndUngrounded = TRUE, .metronomeBanned = TRUE, @@ -10371,7 +10371,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, .skyBattleBanned = TRUE, }, @@ -10386,7 +10386,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .skyBattleBanned = TRUE, }, @@ -10401,7 +10401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -10415,7 +10415,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, .metronomeBanned = TRUE, }, @@ -10430,7 +10430,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, }, @@ -10444,7 +10444,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -10459,7 +10459,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .metronomeBanned = TRUE, @@ -10479,7 +10479,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .healBlockBanned = TRUE, .snatchAffected = TRUE, @@ -10497,7 +10497,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 2, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -10511,7 +10511,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 4, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .protectionMove = TRUE, .ignoresProtect = TRUE, @@ -10531,7 +10531,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -10545,7 +10545,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetDefenseEvasionStages = TRUE, }, @@ -10560,7 +10560,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .argument = STATUS1_BURN, .sheerForceBoost = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -10577,7 +10577,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -10592,7 +10592,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .argument = MOVE_EFFECT_FLORAL_HEALING, .mirrorMoveBanned = TRUE, @@ -10610,7 +10610,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -10624,7 +10624,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .magicCoatAffected = TRUE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, @@ -10640,7 +10640,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .twoTurnMove = TRUE, .makesContact = TRUE, .slicingMove = TRUE, @@ -10658,7 +10658,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_SPOTLIGHT] = @@ -10671,7 +10671,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 3, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPDEF_UP_1 }, .magicCoatAffected = TRUE, .mirrorMoveBanned = TRUE, @@ -10690,7 +10690,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .magicCoatAffected = TRUE, }, @@ -10705,7 +10705,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -10722,7 +10722,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -10740,7 +10740,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -10755,7 +10755,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ballisticMove = TRUE, }, @@ -10769,7 +10769,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -10784,7 +10784,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -10800,7 +10800,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -10815,7 +10815,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -10830,7 +10830,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -10844,7 +10844,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .thawsUser = TRUE, }, @@ -10858,7 +10858,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresSubstitute = TRUE, }, @@ -10873,7 +10873,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -10887,7 +10887,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_ALL_STATS_UP_1 }, .mirrorMoveBanned = TRUE, .healBlockBanned = TRUE, @@ -10904,7 +10904,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .danceMove = TRUE, }, @@ -10918,7 +10918,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .zMove = { .powerOverride = 140 }, }, @@ -10932,7 +10932,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -10947,7 +10947,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPATK_UP_1 }, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -10965,7 +10965,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = -3, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .mirrorMoveBanned = TRUE, .ballisticMove = TRUE, .meFirstBanned = TRUE, @@ -10986,7 +10986,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .soundMove = TRUE, }, @@ -11001,7 +11001,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -11015,7 +11015,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -11029,7 +11029,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -11046,7 +11046,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = -3, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -11066,7 +11066,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -11080,7 +11080,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .bitingMove = TRUE, }, @@ -11095,7 +11095,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -11110,7 +11110,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -11124,7 +11124,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -11138,7 +11138,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -11153,7 +11153,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SPECTRAL_THIEF] = @@ -11166,7 +11166,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .ignoresSubstitute = TRUE, .makesContact = TRUE, .metronomeBanned = TRUE, @@ -11182,7 +11182,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresTargetAbility = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, @@ -11198,7 +11198,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresTargetAbility = TRUE, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, }, @@ -11213,7 +11213,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_DEF_UP_1 }, .ignoresProtect = TRUE, .magicCoatAffected = TRUE, @@ -11229,7 +11229,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -11243,7 +11243,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = B_UPDATED_MOVE_FLAGS >= GEN_8, }, @@ -11261,7 +11261,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = HOLD_EFFECT_MEMORY, .makesContact = TRUE, }, @@ -11276,7 +11276,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -11290,7 +11290,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, @@ -11306,7 +11306,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ignoresTargetAbility = TRUE, .metronomeBanned = TRUE, }, @@ -11328,7 +11328,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 2, .critBoost = ALWAYS_CRIT, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, @@ -11344,7 +11344,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, @@ -11360,7 +11360,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, @@ -11378,7 +11378,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11399,7 +11399,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, .healBlockBanned = B_HEAL_BLOCKING >= GEN_6, @@ -11420,7 +11420,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11440,7 +11440,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .thawsUser = TRUE, @@ -11462,7 +11462,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11482,7 +11482,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11503,7 +11503,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .magicCoatAffected = TRUE, .metronomeBanned = TRUE, @@ -11525,7 +11525,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11546,7 +11546,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, }, @@ -11561,7 +11561,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .mirrorMoveBanned = B_UPDATED_MOVE_FLAGS < GEN_8, .metronomeBanned = TRUE, @@ -11577,7 +11577,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -11596,7 +11596,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -11619,7 +11619,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_JAW_LOCK] = @@ -11632,7 +11632,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .bitingMove = TRUE, }, @@ -11647,7 +11647,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -11663,7 +11663,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -11679,7 +11679,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .magicCoatAffected = TRUE, }, @@ -11693,7 +11693,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .argument = TYPE_PSYCHIC, .magicCoatAffected = TRUE, .powderMove = TRUE, @@ -11709,7 +11709,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .strikeCount = 2, .parentalBondBanned = TRUE, }, @@ -11724,7 +11724,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -11740,7 +11740,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, }, [MOVE_BOLT_BEAK] = @@ -11753,7 +11753,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -11767,7 +11767,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .bitingMove = TRUE, }, @@ -11782,7 +11782,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, }, @@ -11796,7 +11796,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -11815,7 +11815,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -11831,7 +11831,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -11847,7 +11847,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -11862,7 +11862,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -11878,7 +11878,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .thawsUser = TRUE, .ballisticMove = TRUE, @@ -11895,7 +11895,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .metronomeBanned = TRUE, @@ -11914,7 +11914,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, .copycatBanned = TRUE, @@ -11932,7 +11932,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, }, @@ -11946,7 +11946,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -11962,7 +11962,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -11977,7 +11977,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, .metronomeBanned = TRUE, @@ -11993,7 +11993,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -12008,7 +12008,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -12023,7 +12023,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -12039,7 +12039,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -12054,7 +12054,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, @@ -12073,7 +12073,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 4, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .protectionMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -12091,7 +12091,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -12106,7 +12106,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, .instructBanned = TRUE, }, @@ -12121,7 +12121,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -12135,7 +12135,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -12149,7 +12149,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_STEEL_ROLLER] = @@ -12162,7 +12162,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .argument = ARG_TRY_REMOVE_TERRAIN_FAIL, // Remove a field terrain if there is one and hit, otherwise fail. .skyBattleBanned = TRUE, @@ -12178,7 +12178,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MOVE_EFFECT_SCALE_SHOT, }, @@ -12192,7 +12192,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .twoTurnMove = TRUE, .instructBanned = TRUE, }, @@ -12207,7 +12207,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -12221,7 +12221,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_GRASSY_GLIDE] = @@ -12238,7 +12238,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -12253,7 +12253,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_TERRAIN_PULSE] = @@ -12266,7 +12266,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .pulseMove = TRUE, }, @@ -12280,7 +12280,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -12295,7 +12295,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -12309,7 +12309,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -12323,7 +12323,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_CORROSIVE_GAS] = @@ -12336,7 +12336,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_FOES_AND_ALLY, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .magicCoatAffected = TRUE, }, @@ -12350,7 +12350,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALLY, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -12366,7 +12366,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, }, @@ -12380,7 +12380,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, }, @@ -12395,7 +12395,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 2, }, @@ -12410,7 +12410,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .thawsUser = TRUE, }, @@ -12425,7 +12425,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, .ignoresSubstitute = TRUE, .mirrorMoveBanned = TRUE, @@ -12448,7 +12448,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = ALWAYS_CRIT, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, @@ -12465,7 +12465,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .strikeCount = 3, @@ -12482,7 +12482,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -12496,7 +12496,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -12514,7 +12514,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -12529,7 +12529,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -12543,7 +12543,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, @@ -12563,7 +12563,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, }, @@ -12577,7 +12577,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -12591,7 +12591,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -12611,7 +12611,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -12626,7 +12626,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -12641,7 +12641,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -12658,7 +12658,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .argument = MOVE_EFFECT_STEALTH_ROCK, .sheerForceBoost = TRUE, @@ -12679,7 +12679,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, .metronomeBanned = TRUE, @@ -12695,7 +12695,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -12713,7 +12713,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_RANDOM, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, }, @@ -12732,7 +12732,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -12751,7 +12751,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_MOUNTAIN_GALE] = @@ -12764,7 +12764,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -12778,7 +12778,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .danceMove = TRUE, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -12799,7 +12799,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, }, @@ -12818,7 +12818,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 50, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -12838,7 +12838,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -12856,7 +12856,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -12870,7 +12870,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -12892,7 +12892,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, // 50% Defense down, 30% Flinch. Can be modified in 'SetMoveEffect' .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, }, @@ -12906,7 +12906,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -12920,7 +12920,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .argument = MOVE_EFFECT_SPIKES, .sheerForceBoost = TRUE, @@ -12942,7 +12942,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -12962,7 +12962,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -12982,7 +12982,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .windMove = TRUE, }, @@ -12997,7 +12997,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13014,7 +13014,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .snatchAffected = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13030,7 +13030,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, // Only since it isn't implemented yet .forcePressure = TRUE, }, @@ -13045,7 +13045,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 4, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .protectionMove = TRUE, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13062,7 +13062,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, }, @@ -13077,7 +13077,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .metronomeBanned = TRUE, // Only since it isn't implemented yet }, @@ -13091,7 +13091,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, }, @@ -13105,7 +13105,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -13121,7 +13121,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .sheerForceBoost = TRUE, @@ -13138,7 +13138,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .magicCoatAffected = TRUE, .metronomeBanned = TRUE, }, @@ -13153,7 +13153,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -13168,7 +13168,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .metronomeBanned = TRUE, @@ -13185,7 +13185,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .argument = ARG_TRY_REMOVE_TERRAIN_HIT, // Remove the active field terrain if there is one. .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -13201,7 +13201,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, // Only since it isn't implemented yet }, @@ -13216,7 +13216,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -13232,7 +13232,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .metronomeBanned = TRUE, }, @@ -13247,7 +13247,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .strikeCount = 3, }, @@ -13262,7 +13262,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .makesContact = TRUE, }, @@ -13277,7 +13277,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -13293,7 +13293,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RECOVER_HP }, .snatchAffected = TRUE, .ignoresProtect = TRUE, @@ -13311,7 +13311,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -13327,7 +13327,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = ALWAYS_CRIT, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_TORCH_SONG] = @@ -13340,7 +13340,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .sheerForceBoost = TRUE, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, @@ -13356,7 +13356,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .sheerForceBoost = TRUE, .danceMove = TRUE, @@ -13372,7 +13372,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -13387,7 +13387,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -13401,7 +13401,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -13415,7 +13415,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -13430,7 +13430,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -13445,7 +13445,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_RESET_STATS }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13462,7 +13462,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13479,7 +13479,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, .metronomeBanned = TRUE, @@ -13495,7 +13495,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_ALL_BATTLERS, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .zMove = { .effect = Z_EFFECT_SPD_UP_1 }, .ignoresProtect = TRUE, .mirrorMoveBanned = TRUE, @@ -13512,7 +13512,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -13527,7 +13527,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -13542,7 +13542,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -13556,7 +13556,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .ignoresProtect = TRUE, .metronomeBanned = TRUE, @@ -13572,7 +13572,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .strikeCount = 2, .metronomeBanned = TRUE, }, @@ -13587,7 +13587,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .punchingMove = TRUE, .metronomeBanned = TRUE, @@ -13603,7 +13603,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .metronomeBanned = TRUE, }, @@ -13617,7 +13617,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, .healBlockBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -13633,7 +13633,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .metronomeBanned = TRUE, }, @@ -13648,7 +13648,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .cantUseTwice = TRUE, }, @@ -13662,7 +13662,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_DEPENDS, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .meFirstBanned = TRUE, .metronomeBanned = TRUE, @@ -13679,7 +13679,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 1, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .slicingMove = TRUE, }, @@ -13693,7 +13693,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -13716,7 +13716,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 10, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -13739,7 +13739,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -13762,7 +13762,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -13785,7 +13785,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 30, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .sheerForceBoost = TRUE, .mirrorMoveBanned = TRUE, .meFirstBanned = TRUE, @@ -13808,7 +13808,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .makesContact = TRUE, .slicingMove = TRUE, }, @@ -13823,7 +13823,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .thawsUser = TRUE, }, @@ -13837,7 +13837,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .cantUseTwice = TRUE, }, @@ -13851,7 +13851,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 20, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .thawsUser = TRUE, .metronomeBanned = TRUE, .healBlockBanned = B_EXTRAPOLATED_MOVE_FLAGS, @@ -13867,7 +13867,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, // syrup bomb volatile status .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .ballisticMove = TRUE, .metronomeBanned = TRUE, }, @@ -13882,7 +13882,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .critBoost = 1, .argument = HOLD_EFFECT_MASK, .metronomeBanned = TRUE, @@ -13899,7 +13899,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, //determined from move type + .category = BATTLE_CATEGORY_PHYSICAL, //determined from move type }, [MOVE_ALL_OUT_PUMMELING] = { @@ -13911,7 +13911,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_SUPERSONIC_SKYSTRIKE] = { @@ -13923,7 +13923,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_ACID_DOWNPOUR] = { @@ -13935,7 +13935,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_TECTONIC_RAGE] = { @@ -13947,7 +13947,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, [MOVE_CONTINENTAL_CRUSH] = @@ -13960,7 +13960,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_SAVAGE_SPIN_OUT] = { @@ -13972,7 +13972,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_NEVER_ENDING_NIGHTMARE] = { @@ -13984,7 +13984,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_CORKSCREW_CRASH] = { @@ -13996,7 +13996,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_INFERNO_OVERDRIVE] = { @@ -14008,7 +14008,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_HYDRO_VORTEX] = { @@ -14020,7 +14020,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_BLOOM_DOOM] = { @@ -14032,7 +14032,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_GIGAVOLT_HAVOC] = { @@ -14044,7 +14044,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_SHATTERED_PSYCHE] = { @@ -14056,7 +14056,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_SUBZERO_SLAMMER] = { @@ -14068,7 +14068,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_DEVASTATING_DRAKE] = { @@ -14080,7 +14080,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_BLACK_HOLE_ECLIPSE] = { @@ -14092,7 +14092,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_TWINKLE_TACKLE] = { @@ -14104,7 +14104,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_CATASTROPIKA] = { @@ -14116,7 +14116,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_10000000_VOLT_THUNDERBOLT] = { @@ -14129,7 +14129,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .target = MOVE_TARGET_SELECTED, .priority = 0, .critBoost = 2, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_STOKED_SPARKSURFER] = { @@ -14141,7 +14141,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_EXTREME_EVOBOOST] = { @@ -14153,7 +14153,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 0, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, }, [MOVE_PULVERIZING_PANCAKE] = { @@ -14165,7 +14165,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_GENESIS_SUPERNOVA] = { @@ -14177,7 +14177,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .argument = ARG_SET_PSYCHIC_TERRAIN, // Set Psychic Terrain. If there's a different field terrain active, overwrite it. }, [MOVE_SINISTER_ARROW_RAID] = @@ -14190,7 +14190,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_MALICIOUS_MOONSAULT] = { @@ -14202,7 +14202,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_OCEANIC_OPERETTA] = { @@ -14214,7 +14214,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SPLINTERED_STORMSHARDS] = { @@ -14226,7 +14226,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = ARG_TRY_REMOVE_TERRAIN_HIT, // Remove the active field terrain if there is one. }, [MOVE_LETS_SNUGGLE_FOREVER] = @@ -14239,7 +14239,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_CLANGOROUS_SOULBLAZE] = { @@ -14251,7 +14251,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_BOTH, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, .soundMove = TRUE, .ignoresSubstitute = B_UPDATED_MOVE_FLAGS >= GEN_6, }, @@ -14265,7 +14265,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SEARING_SUNRAZE_SMASH] = { @@ -14277,7 +14277,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_MENACING_MOONRAZE_MAELSTROM] = { @@ -14289,7 +14289,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_LIGHT_THAT_BURNS_THE_SKY] = { @@ -14301,7 +14301,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_SPECIAL, + .category = BATTLE_CATEGORY_SPECIAL, }, [MOVE_SOUL_STEALING_7_STAR_STRIKE] = { @@ -14313,7 +14313,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, }, [MOVE_MAX_GUARD] = @@ -14326,7 +14326,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 0, .target = MOVE_TARGET_USER, .priority = 4, - .split = SPLIT_STATUS, + .category = BATTLE_CATEGORY_STATUS, .protectionMove = TRUE, }, @@ -14340,7 +14340,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SUN, }, @@ -14354,7 +14354,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SP_ATK, }, @@ -14368,7 +14368,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_ELECTRIC_TERRAIN, }, @@ -14382,7 +14382,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SPEED, }, @@ -14396,7 +14396,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_ATTACK, }, @@ -14410,7 +14410,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_DEFENSE, }, @@ -14424,7 +14424,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_HAIL, }, @@ -14438,7 +14438,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_SP_ATK, }, @@ -14452,7 +14452,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAIN, }, @@ -14466,7 +14466,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_SPEED, }, @@ -14480,7 +14480,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_MISTY_TERRAIN, }, @@ -14494,7 +14494,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_ATTACK, }, @@ -14508,7 +14508,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_PSYCHIC_TERRAIN, }, @@ -14522,7 +14522,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SANDSTORM, }, @@ -14536,7 +14536,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_SP_DEF, .skyBattleBanned = B_EXTRAPOLATED_MOVE_FLAGS, }, @@ -14551,7 +14551,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SP_DEF, }, @@ -14565,7 +14565,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_GRASSY_TERRAIN, }, @@ -14579,7 +14579,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RAISE_TEAM_DEFENSE, }, @@ -14593,7 +14593,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_VINE_LASH, }, @@ -14607,7 +14607,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_WILDFIRE, }, @@ -14621,7 +14621,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CANNONADE, }, @@ -14635,7 +14635,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_EFFECT_SPORE_FOES, }, @@ -14649,7 +14649,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_PARALYZE_FOES, }, @@ -14663,7 +14663,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CONFUSE_FOES_PAY_DAY, }, @@ -14677,7 +14677,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CRIT_PLUS, }, @@ -14691,7 +14691,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_MEAN_LOOK, }, @@ -14705,7 +14705,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_SPEED_2_FOES, }, @@ -14719,7 +14719,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_AURORA_VEIL, }, @@ -14733,7 +14733,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_INFATUATE_FOES, }, @@ -14747,7 +14747,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_RECYCLE_BERRIES, }, @@ -14761,7 +14761,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_POISON_FOES, }, @@ -14775,7 +14775,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_TORMENT_FOES, }, @@ -14789,7 +14789,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO .ignoresTargetAbility = TRUE, }, @@ -14804,7 +14804,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO .ignoresTargetAbility = TRUE, }, @@ -14819,7 +14819,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIXED_POWER, //EFFECT TODO .ignoresTargetAbility = TRUE, }, @@ -14834,7 +14834,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_DEFOG, }, @@ -14848,7 +14848,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_GRAVITY, }, @@ -14862,7 +14862,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_STEALTH_ROCK, }, @@ -14876,7 +14876,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_VOLCALITH, }, @@ -14890,7 +14890,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_LOWER_EVASIVENESS_FOES, }, @@ -14904,7 +14904,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_AROMATHERAPY, }, @@ -14918,7 +14918,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SANDBLAST_FOES, }, @@ -14932,7 +14932,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_POISON_PARALYZE_FOES, }, @@ -14946,7 +14946,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_FIRE_SPIN_FOES, }, @@ -14960,7 +14960,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_CONFUSE_FOES, }, @@ -14975,7 +14975,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_YAWN_FOE, }, @@ -14989,7 +14989,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_HEAL_TEAM, }, @@ -15003,7 +15003,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_STEELSURGE, }, @@ -15017,7 +15017,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_SPITE, }, @@ -15031,7 +15031,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_BYPASS_PROTECT, //EFFECT TODO }, @@ -15045,7 +15045,7 @@ const struct BattleMove gBattleMoves[MOVES_COUNT_DYNAMAX] = .secondaryEffectChance = 100, .target = MOVE_TARGET_SELECTED, .priority = 0, - .split = SPLIT_PHYSICAL, + .category = BATTLE_CATEGORY_PHYSICAL, .argument = MAX_EFFECT_BYPASS_PROTECT, //EFFECT TODO }, diff --git a/src/pokedex_plus_hgss.c b/src/pokedex_plus_hgss.c index d5258362ab..27fac583ae 100644 --- a/src/pokedex_plus_hgss.c +++ b/src/pokedex_plus_hgss.c @@ -429,7 +429,7 @@ struct PokedexView u8 statBarsSpriteId; u8 statBarsBgSpriteId; bool8 justScrolled; - u8 splitIconSpriteId; //Physical/Special Split + u8 categoryIconSpriteId; //Physical/Special/Status category u8 numEggMoves; u8 numLevelUpMoves; u8 numTMHMMoves; @@ -614,62 +614,61 @@ static void PrintForms(u8 taskId, u16 species); static void Task_SwitchScreensFromFormsScreen(u8 taskId); static void Task_ExitFormsScreen(u8 taskId); -//Physical Special Split icon -static u8 ShowSplitIcon(u32 split); //Physical/Special Split from BE -static void DestroySplitIcon(void); //Physical/Special Split from BE +//Physical/Special/Status category icon +static u8 ShowCategoryIcon(u32 category); +static void DestroyCategoryIcon(void); static u16 NationalPokedexNumToSpeciesHGSS(u16 nationalNum); -//Physical/Special Split from BE -#define TAG_SPLIT_ICONS 30004 +#define TAG_CATEGORY_ICONS 30004 -static const u16 sSplitIcons_Pal[] = INCBIN_U16("graphics/interface/split_icons.gbapal"); -static const u32 sSplitIcons_Gfx[] = INCBIN_U32("graphics/interface/split_icons.4bpp.lz"); +static const u16 sCategoryIcons_Pal[] = INCBIN_U16("graphics/interface/category_icons.gbapal"); +static const u32 sCategoryIcons_Gfx[] = INCBIN_U32("graphics/interface/category_icons.4bpp.lz"); -static const struct OamData sOamData_SplitIcons = +static const struct OamData sOamData_CategoryIcons = { .size = SPRITE_SIZE(16x16), .shape = SPRITE_SHAPE(16x16), .priority = 0, }; -static const struct CompressedSpriteSheet sSpriteSheet_SplitIcons = +static const struct CompressedSpriteSheet sSpriteSheet_CategoryIcons = { - .data = sSplitIcons_Gfx, + .data = sCategoryIcons_Gfx, .size = 16*16*3/2, - .tag = TAG_SPLIT_ICONS, + .tag = TAG_CATEGORY_ICONS, }; -static const struct SpritePalette sSpritePal_SplitIcons = +static const struct SpritePalette sSpritePal_CategoryIcons = { - .data = sSplitIcons_Pal, - .tag = TAG_SPLIT_ICONS + .data = sCategoryIcons_Pal, + .tag = TAG_CATEGORY_ICONS }; -static const union AnimCmd sSpriteAnim_SplitIcon0[] = +static const union AnimCmd sSpriteAnim_CategoryIcon0[] = { ANIMCMD_FRAME(0, 0), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_SplitIcon1[] = +static const union AnimCmd sSpriteAnim_CategoryIcon1[] = { ANIMCMD_FRAME(4, 0), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_SplitIcon2[] = +static const union AnimCmd sSpriteAnim_CategoryIcon2[] = { ANIMCMD_FRAME(8, 0), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_SplitIcons[] = +static const union AnimCmd *const sSpriteAnimTable_CategoryIcons[] = { - sSpriteAnim_SplitIcon0, - sSpriteAnim_SplitIcon1, - sSpriteAnim_SplitIcon2, + sSpriteAnim_CategoryIcon0, + sSpriteAnim_CategoryIcon1, + sSpriteAnim_CategoryIcon2, }; -static const struct SpriteTemplate sSpriteTemplate_SplitIcons = +static const struct SpriteTemplate sSpriteTemplate_CategoryIcons = { - .tileTag = TAG_SPLIT_ICONS, - .paletteTag = TAG_SPLIT_ICONS, - .oam = &sOamData_SplitIcons, - .anims = sSpriteAnimTable_SplitIcons, + .tileTag = TAG_CATEGORY_ICONS, + .paletteTag = TAG_CATEGORY_ICONS, + .oam = &sOamData_CategoryIcons, + .anims = sSpriteAnimTable_CategoryIcons, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy @@ -4931,21 +4930,22 @@ static void LoadTilesetTilemapHGSS(u8 page) } } -//Physical/Special Split -static u8 ShowSplitIcon(u32 split) +//Physical/Special/Status category +static u8 ShowCategoryIcon(u32 category) { - if (sPokedexView->splitIconSpriteId == 0xFF) - sPokedexView->splitIconSpriteId = CreateSprite(&sSpriteTemplate_SplitIcons, 139, 90, 0); + if (sPokedexView->categoryIconSpriteId == 0xFF) + sPokedexView->categoryIconSpriteId = CreateSprite(&sSpriteTemplate_CategoryIcons, 139, 90, 0); - gSprites[sPokedexView->splitIconSpriteId].invisible = FALSE; - StartSpriteAnim(&gSprites[sPokedexView->splitIconSpriteId], split); - return sPokedexView->splitIconSpriteId; + gSprites[sPokedexView->categoryIconSpriteId].invisible = FALSE; + StartSpriteAnim(&gSprites[sPokedexView->categoryIconSpriteId], category); + return sPokedexView->categoryIconSpriteId; } -static void DestroySplitIcon(void) + +static void DestroyCategoryIcon(void) { - if (sPokedexView->splitIconSpriteId != 0xFF) - DestroySprite(&gSprites[sPokedexView->splitIconSpriteId]); - sPokedexView->splitIconSpriteId = 0xFF; + if (sPokedexView->categoryIconSpriteId != 0xFF) + DestroySprite(&gSprites[sPokedexView->categoryIconSpriteId]); + sPokedexView->categoryIconSpriteId = 0xFF; } //************************************ @@ -5075,10 +5075,10 @@ static void Task_LoadStatsScreen(u8 taskId) sPokedexView->typeIconSpriteIds[0] = 0xFF; sPokedexView->typeIconSpriteIds[1] = 0xFF; CreateTypeIconSprites(); - sPokedexView->splitIconSpriteId = 0xFF; //Physical/Special Split - LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60); //Physical/Special Split - LoadCompressedSpriteSheet(&sSpriteSheet_SplitIcons); //Physical/Special Split - LoadSpritePalette(&sSpritePal_SplitIcons); //Physical/Special Split + sPokedexView->categoryIconSpriteId = 0xFF; + LoadCompressedPalette(gMoveTypes_Pal, 0x1D0, 0x60); + LoadCompressedSpriteSheet(&sSpriteSheet_CategoryIcons); + LoadSpritePalette(&sSpritePal_CategoryIcons); gMain.state++; break; case 4: @@ -5498,9 +5498,9 @@ static void PrintStatsScreen_Moves_Bottom(u8 taskId) else ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].power, STR_CONV_MODE_RIGHT_ALIGN, 3); PrintStatsScreenTextSmall(WIN_STATS_MOVES_BOTTOM, gStringVar1, moves_x + 45, moves_y); - //Physical/Special Split - DestroySplitIcon(); - ShowSplitIcon(GetBattleMoveSplit(move)); + //Physical/Special/Status Category + DestroyCategoryIcon(); + ShowCategoryIcon(GetBattleMoveCategory(move)); //Accuracy if (gBattleMoves[move].accuracy == 0) StringCopy(gStringVar1, gText_ThreeDashes); @@ -5510,8 +5510,8 @@ static void PrintStatsScreen_Moves_Bottom(u8 taskId) } else //Appeal + Jam { - DestroySplitIcon(); - gSprites[sPokedexView->splitIconSpriteId].invisible = TRUE; + DestroyCategoryIcon(); + gSprites[sPokedexView->categoryIconSpriteId].invisible = TRUE; //Appeal contest_effectValue = gContestEffects[gContestMoves[move].effect].appeal; if (contest_effectValue != 0xFF) diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index b4d4ae1f4e..2ea61ba730 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -189,7 +189,7 @@ static EWRAM_DATA struct PokemonSummaryScreenData bool8 handleDeoxys; s16 switchCounter; // Used for various switch statement cases that decompress/load graphics or pokemon data u8 unk_filler4[6]; - u8 splitIconSpriteId; + u8 categoryIconSpriteId; } *sMonSummaryScreen = NULL; EWRAM_DATA u8 gLastViewedMonIndex = 0; @@ -738,62 +738,62 @@ static const u8 sMovesPPLayout[] = _("{PP}{DYNAMIC 0}/{DYNAMIC 1}"); #define TAG_MON_STATUS 30001 #define TAG_MOVE_TYPES 30002 #define TAG_MON_MARKINGS 30003 -#define TAG_SPLIT_ICONS 30004 +#define TAG_CATEGORY_ICONS 30004 -static const u16 sSplitIcons_Pal[] = INCBIN_U16("graphics/interface/split_icons.gbapal"); -static const u32 sSplitIcons_Gfx[] = INCBIN_U32("graphics/interface/split_icons.4bpp.lz"); +static const u16 sCategoryIcons_Pal[] = INCBIN_U16("graphics/interface/category_icons.gbapal"); +static const u32 sCategoryIcons_Gfx[] = INCBIN_U32("graphics/interface/category_icons.4bpp.lz"); -static const struct OamData sOamData_SplitIcons = +static const struct OamData sOamData_CategoryIcons = { .size = SPRITE_SIZE(16x16), .shape = SPRITE_SHAPE(16x16), .priority = 0, }; -static const struct CompressedSpriteSheet sSpriteSheet_SplitIcons = +static const struct CompressedSpriteSheet sSpriteSheet_CategoryIcons = { - .data = sSplitIcons_Gfx, + .data = sCategoryIcons_Gfx, .size = 16*16*3/2, - .tag = TAG_SPLIT_ICONS, + .tag = TAG_CATEGORY_ICONS, }; -static const struct SpritePalette sSpritePal_SplitIcons = +static const struct SpritePalette sSpritePal_CategoryIcons = { - .data = sSplitIcons_Pal, - .tag = TAG_SPLIT_ICONS + .data = sCategoryIcons_Pal, + .tag = TAG_CATEGORY_ICONS }; -static const union AnimCmd sSpriteAnim_SplitIcon0[] = +static const union AnimCmd sSpriteAnim_CategoryIcon0[] = { ANIMCMD_FRAME(0, 0), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_SplitIcon1[] = +static const union AnimCmd sSpriteAnim_CategoryIcon1[] = { ANIMCMD_FRAME(4, 0), ANIMCMD_END }; -static const union AnimCmd sSpriteAnim_SplitIcon2[] = +static const union AnimCmd sSpriteAnim_CategoryIcon2[] = { ANIMCMD_FRAME(8, 0), ANIMCMD_END }; -static const union AnimCmd *const sSpriteAnimTable_SplitIcons[] = +static const union AnimCmd *const sSpriteAnimTable_CategoryIcons[] = { - sSpriteAnim_SplitIcon0, - sSpriteAnim_SplitIcon1, - sSpriteAnim_SplitIcon2, + sSpriteAnim_CategoryIcon0, + sSpriteAnim_CategoryIcon1, + sSpriteAnim_CategoryIcon2, }; -static const struct SpriteTemplate sSpriteTemplate_SplitIcons = +static const struct SpriteTemplate sSpriteTemplate_CategoryIcons = { - .tileTag = TAG_SPLIT_ICONS, - .paletteTag = TAG_SPLIT_ICONS, - .oam = &sOamData_SplitIcons, - .anims = sSpriteAnimTable_SplitIcons, + .tileTag = TAG_CATEGORY_ICONS, + .paletteTag = TAG_CATEGORY_ICONS, + .oam = &sOamData_CategoryIcons, + .anims = sSpriteAnimTable_CategoryIcons, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy @@ -1153,21 +1153,21 @@ static const struct SpriteTemplate sSpriteTemplate_StatusCondition = static const u16 sMarkings_Pal[] = INCBIN_U16("graphics/summary_screen/markings.gbapal"); // code -static u8 ShowSplitIcon(u32 split) +static u8 ShowCategoryIcon(u32 category) { - if (sMonSummaryScreen->splitIconSpriteId == 0xFF) - sMonSummaryScreen->splitIconSpriteId = CreateSprite(&sSpriteTemplate_SplitIcons, 48, 129, 0); + if (sMonSummaryScreen->categoryIconSpriteId == 0xFF) + sMonSummaryScreen->categoryIconSpriteId = CreateSprite(&sSpriteTemplate_CategoryIcons, 48, 129, 0); - gSprites[sMonSummaryScreen->splitIconSpriteId].invisible = FALSE; - StartSpriteAnim(&gSprites[sMonSummaryScreen->splitIconSpriteId], split); - return sMonSummaryScreen->splitIconSpriteId; + gSprites[sMonSummaryScreen->categoryIconSpriteId].invisible = FALSE; + StartSpriteAnim(&gSprites[sMonSummaryScreen->categoryIconSpriteId], category); + return sMonSummaryScreen->categoryIconSpriteId; } -static void DestroySplitIcon(void) +static void DestroyCategoryIcon(void) { - if (sMonSummaryScreen->splitIconSpriteId != 0xFF) - DestroySprite(&gSprites[sMonSummaryScreen->splitIconSpriteId]); - sMonSummaryScreen->splitIconSpriteId = 0xFF; + if (sMonSummaryScreen->categoryIconSpriteId != 0xFF) + DestroySprite(&gSprites[sMonSummaryScreen->categoryIconSpriteId]); + sMonSummaryScreen->categoryIconSpriteId = 0xFF; } void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void)) @@ -1204,7 +1204,7 @@ void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, } sMonSummaryScreen->currPageIndex = sMonSummaryScreen->minPageIndex; - sMonSummaryScreen->splitIconSpriteId = 0xFF; + sMonSummaryScreen->categoryIconSpriteId = 0xFF; SummaryScreen_SetAnimDelayTaskId(TASK_NONE); if (gMonSpritesGfxPtr == NULL) @@ -1451,8 +1451,8 @@ static bool8 DecompressGraphics(void) break; case 12: LoadCompressedPalette(gMoveTypes_Pal, OBJ_PLTT_ID(13), 3 * PLTT_SIZE_4BPP); - LoadCompressedSpriteSheet(&sSpriteSheet_SplitIcons); - LoadSpritePalette(&sSpritePal_SplitIcons); + LoadCompressedSpriteSheet(&sSpriteSheet_CategoryIcons); + LoadSpritePalette(&sSpritePal_CategoryIcons); sMonSummaryScreen->switchCounter = 0; return TRUE; } @@ -2090,7 +2090,7 @@ static void ChangeSelectedMove(s16 *taskData, s8 direction, u8 *moveIndexPtr) { ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); - DestroySplitIcon(); + DestroyCategoryIcon(); ScheduleBgCopyTilemapToVram(0); HandlePowerAccTilemap(0, 3); HandleAppealJamTilemap(0, 3, 0); @@ -2117,7 +2117,7 @@ static void CloseMoveSelectMode(u8 taskId) { ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); - DestroySplitIcon(); + DestroyCategoryIcon(); HandlePowerAccTilemap(0, 3); HandleAppealJamTilemap(0, 3, 0); } @@ -2344,7 +2344,7 @@ static void ShowCantForgetHMsWindow(u8 taskId) { ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_APPEAL_JAM); - gSprites[sMonSummaryScreen->splitIconSpriteId].invisible = TRUE; + gSprites[sMonSummaryScreen->categoryIconSpriteId].invisible = TRUE; ScheduleBgCopyTilemapToVram(0); HandlePowerAccTilemap(0, 3); HandleAppealJamTilemap(0, 3, 0); @@ -3044,7 +3044,7 @@ static void ClearPageWindowTilemaps(u8 page) if (sMonSummaryScreen->newMove != MOVE_NONE || sMonSummaryScreen->firstMoveIndex != MAX_MON_MOVES) { ClearWindowTilemap(PSS_LABEL_WINDOW_MOVES_POWER_ACC); - gSprites[sMonSummaryScreen->splitIconSpriteId].invisible = TRUE; + gSprites[sMonSummaryScreen->categoryIconSpriteId].invisible = TRUE; } } else @@ -3764,8 +3764,8 @@ static void PrintMoveDetails(u16 move) if (sMonSummaryScreen->currPageIndex == PSS_PAGE_BATTLE_MOVES) { moveEffect = gBattleMoves[move].effect; - if (B_SHOW_SPLIT_ICON == TRUE) - ShowSplitIcon(GetBattleMoveSplit(move)); + if (B_SHOW_CATEGORY_ICON == TRUE) + ShowCategoryIcon(GetBattleMoveCategory(move)); PrintMovePowerAndAccuracy(move); if (moveEffect != EFFECT_PLACEHOLDER) diff --git a/test/battle/ability/beads_of_ruin.c b/test/battle/ability/beads_of_ruin.c index b406a9ecf3..3c1f425d6d 100644 --- a/test/battle/ability/beads_of_ruin.c +++ b/test/battle/ability/beads_of_ruin.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_WATER_GUN].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Beads of Ruin reduces Sp. Def", s16 damage) diff --git a/test/battle/ability/contrary.c b/test/battle/ability/contrary.c index 76c3d68c58..03af17bdc0 100644 --- a/test/battle/ability/contrary.c +++ b/test/battle/ability/contrary.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Contrary raises Attack when Intimidated in a single battle", s16 damage) @@ -83,7 +83,7 @@ SINGLE_BATTLE_TEST("Contrary raises stats after using a move which would normall PARAMETRIZE { ability = ABILITY_TANGLED_FEET; } GIVEN { ASSUME(gBattleMoves[MOVE_OVERHEAT].effect == EFFECT_OVERHEAT); - ASSUME(gBattleMoves[MOVE_OVERHEAT].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_OVERHEAT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_SPINDA) { Ability(ability); } } WHEN { diff --git a/test/battle/ability/defeatist.c b/test/battle/ability/defeatist.c index 820c7da355..8c3c208b64 100644 --- a/test/battle/ability/defeatist.c +++ b/test/battle/ability/defeatist.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_ECHOED_VOICE].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_ECHOED_VOICE].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Defeatist halves Attack when HP <= 50%", s16 damage) diff --git a/test/battle/ability/download.c b/test/battle/ability/download.c index 5b59e37f00..6546311a4a 100644 --- a/test/battle/ability/download.c +++ b/test/battle/ability/download.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_TRI_ATTACK].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TRI_ATTACK].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Download raises Attack if player has lower Def than Sp. Def", s16 damage) diff --git a/test/battle/ability/dragons_maw.c b/test/battle/ability/dragons_maw.c index af633d81d0..e05c47bfd5 100644 --- a/test/battle/ability/dragons_maw.c +++ b/test/battle/ability/dragons_maw.c @@ -17,8 +17,8 @@ SINGLE_BATTLE_TEST("Dragon's Maw increases Dragon-type move damage", s16 damage) ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_DRAGON); ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].type == TYPE_DRAGON); ASSUME(gBattleMoves[MOVE_DRAGON_BREATH].type == TYPE_DRAGON); - ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_DRAGON_BREATH].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_DRAGON_CLAW].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_DRAGON_BREATH].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_REGIDRAGO) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/earth_eater.c b/test/battle/ability/earth_eater.c index 6bd42fdda6..fb0ddf6209 100644 --- a/test/battle/ability/earth_eater.c +++ b/test/battle/ability/earth_eater.c @@ -36,7 +36,7 @@ SINGLE_BATTLE_TEST("Earth Eater activates on status moves") { GIVEN { ASSUME(gBattleMoves[MOVE_SAND_ATTACK].type == TYPE_GROUND); - ASSUME(gBattleMoves[MOVE_SAND_ATTACK].split == SPLIT_STATUS); + ASSUME(gBattleMoves[MOVE_SAND_ATTACK].category == BATTLE_CATEGORY_STATUS); PLAYER(SPECIES_ORTHWORM) { Ability(ABILITY_EARTH_EATER); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/electromorphosis.c b/test/battle/ability/electromorphosis.c index 7ee4b81a7e..58c9afbe99 100644 --- a/test/battle/ability/electromorphosis.c +++ b/test/battle/ability/electromorphosis.c @@ -12,8 +12,8 @@ SINGLE_BATTLE_TEST("Electromorphosis sets up Charge when hit by any move") GIVEN { ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); ASSUME(gBattleMoves[MOVE_GUST].power != 0); - ASSUME(gBattleMoves[MOVE_GUST].split == SPLIT_SPECIAL); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].power != 0); ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); diff --git a/test/battle/ability/ice_scales.c b/test/battle/ability/ice_scales.c index c4984c35b0..5d1db524a2 100644 --- a/test/battle/ability/ice_scales.c +++ b/test/battle/ability/ice_scales.c @@ -12,10 +12,10 @@ SINGLE_BATTLE_TEST("Ice Scales halves the damage from special moves", s16 damage PARAMETRIZE { ability = ABILITY_SHIELD_DUST; move = MOVE_TACKLE; } PARAMETRIZE { ability = ABILITY_ICE_SCALES; move = MOVE_TACKLE; } GIVEN { - ASSUME(gBattleMoves[MOVE_PSYCHIC].split == SPLIT_SPECIAL); - ASSUME(gBattleMoves[MOVE_PSYSHOCK].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_PSYCHIC].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gBattleMoves[MOVE_PSYSHOCK].category == BATTLE_CATEGORY_SPECIAL); ASSUME(gBattleMoves[MOVE_PSYSHOCK].effect == EFFECT_PSYSHOCK); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_FROSMOTH) { Ability(ability); } } WHEN { diff --git a/test/battle/ability/intimidate.c b/test/battle/ability/intimidate.c index a0a23cc132..c64bdaeebf 100644 --- a/test/battle/ability/intimidate.c +++ b/test/battle/ability/intimidate.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Intimidate (opponent) lowers player's attack after switch out", s16 damage) diff --git a/test/battle/ability/parental_bond.c b/test/battle/ability/parental_bond.c index 9d0598304d..f1d34cd30a 100644 --- a/test/battle/ability/parental_bond.c +++ b/test/battle/ability/parental_bond.c @@ -4,7 +4,7 @@ SINGLE_BATTLE_TEST("Parental Bond converts Tackle into a two-strike move") { GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].split != SPLIT_STATUS); + ASSUME(gBattleMoves[MOVE_TACKLE].category != BATTLE_CATEGORY_STATUS); ASSUME(gBattleMoves[MOVE_TACKLE].strikeCount < 2); ASSUME(gBattleMoves[MOVE_TACKLE].effect == EFFECT_HIT); PLAYER(SPECIES_KANGASKHAN) { Item(ITEM_KANGASKHANITE); } diff --git a/test/battle/ability/prankster.c b/test/battle/ability/prankster.c index 8040789f43..bcff336789 100644 --- a/test/battle/ability/prankster.c +++ b/test/battle/ability/prankster.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gSpeciesInfo[SPECIES_UMBREON].types[0] == TYPE_DARK); - ASSUME(gBattleMoves[MOVE_CONFUSE_RAY].split == SPLIT_STATUS); + ASSUME(gBattleMoves[MOVE_CONFUSE_RAY].category == BATTLE_CATEGORY_STATUS); } SINGLE_BATTLE_TEST("Prankster-affected moves don't affect Dark-type Pokémon") diff --git a/test/battle/ability/protosynthesis.c b/test/battle/ability/protosynthesis.c index 93ed9630e9..4f1b82b853 100644 --- a/test/battle/ability/protosynthesis.c +++ b/test/battle/ability/protosynthesis.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_ROUND].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_ROUND].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Protosynthesis boosts the highest stat") diff --git a/test/battle/ability/quark_drive.c b/test/battle/ability/quark_drive.c index f4448e1439..a70934cc70 100644 --- a/test/battle/ability/quark_drive.c +++ b/test/battle/ability/quark_drive.c @@ -3,8 +3,8 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_ROUND].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_ROUND].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Quark Drive boosts the highest stat") diff --git a/test/battle/ability/rocky_payload.c b/test/battle/ability/rocky_payload.c index dd68bd6102..39ca5249e6 100644 --- a/test/battle/ability/rocky_payload.c +++ b/test/battle/ability/rocky_payload.c @@ -17,8 +17,8 @@ SINGLE_BATTLE_TEST("Rocky Payload increases Rock-type move damage", s16 damage) ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_ROCK); ASSUME(gBattleMoves[MOVE_ROCK_THROW].type == TYPE_ROCK); ASSUME(gBattleMoves[MOVE_POWER_GEM].type == TYPE_ROCK); - ASSUME(gBattleMoves[MOVE_ROCK_THROW].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_POWER_GEM].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_ROCK_THROW].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_POWER_GEM].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_BOMBIRDIER) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/stamina.c b/test/battle/ability/stamina.c index e4a1a255a3..bf1713c73d 100644 --- a/test/battle/ability/stamina.c +++ b/test/battle/ability/stamina.c @@ -26,8 +26,8 @@ SINGLE_BATTLE_TEST("Stamina raises Defense by 1 when hit by a move") GIVEN { ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); ASSUME(gBattleMoves[MOVE_GUST].power != 0); - ASSUME(gBattleMoves[MOVE_GUST].split == SPLIT_SPECIAL); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Ability(ABILITY_STAMINA); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/steelworker.c b/test/battle/ability/steelworker.c index bf7d0ca9c6..af36053664 100644 --- a/test/battle/ability/steelworker.c +++ b/test/battle/ability/steelworker.c @@ -17,8 +17,8 @@ SINGLE_BATTLE_TEST("Steelworker increases Steel-type move damage", s16 damage) ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_STEEL); ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].type == TYPE_STEEL); ASSUME(gBattleMoves[MOVE_FLASH_CANNON].type == TYPE_STEEL); - ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_FLASH_CANNON].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_ANCHOR_SHOT].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_FLASH_CANNON].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_DHELMISE) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/sword_of_ruin.c b/test/battle/ability/sword_of_ruin.c index 35ba4f6e0d..0f4d95b3ad 100644 --- a/test/battle/ability/sword_of_ruin.c +++ b/test/battle/ability/sword_of_ruin.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Sword of Ruin reduces Defense", s16 damage) diff --git a/test/battle/ability/tablets_of_ruin.c b/test/battle/ability/tablets_of_ruin.c index ca12b68131..2b7e450808 100644 --- a/test/battle/ability/tablets_of_ruin.c +++ b/test/battle/ability/tablets_of_ruin.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Tablets of Ruin reduces Attack", s16 damage) diff --git a/test/battle/ability/transistor.c b/test/battle/ability/transistor.c index ab2509309a..9f204bfe1e 100644 --- a/test/battle/ability/transistor.c +++ b/test/battle/ability/transistor.c @@ -17,8 +17,8 @@ SINGLE_BATTLE_TEST("Transistor increases Electric-type move damage", s16 damage) ASSUME(gBattleMoves[MOVE_TACKLE].type != TYPE_ELECTRIC); ASSUME(gBattleMoves[MOVE_WILD_CHARGE].type == TYPE_ELECTRIC); ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].type == TYPE_ELECTRIC); - ASSUME(gBattleMoves[MOVE_WILD_CHARGE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_WILD_CHARGE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_THUNDER_SHOCK].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_REGIELEKI) { Ability(ability); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/vessel_of_ruin.c b/test/battle/ability/vessel_of_ruin.c index 4f8408795a..1395bfa012 100644 --- a/test/battle/ability/vessel_of_ruin.c +++ b/test/battle/ability/vessel_of_ruin.c @@ -3,7 +3,7 @@ ASSUMPTIONS { - ASSUME(gBattleMoves[MOVE_WATER_GUN].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Vessel of Ruin reduces Sp. Atk", s16 damage) diff --git a/test/battle/ability/volt_absorb.c b/test/battle/ability/volt_absorb.c index 2f69a287ba..265346f2d7 100644 --- a/test/battle/ability/volt_absorb.c +++ b/test/battle/ability/volt_absorb.c @@ -33,7 +33,7 @@ SINGLE_BATTLE_TEST("Volt Absorb activates on status moves") { GIVEN { ASSUME(gBattleMoves[MOVE_THUNDER_WAVE].type == TYPE_ELECTRIC); - ASSUME(gBattleMoves[MOVE_THUNDER_WAVE].split == SPLIT_STATUS); + ASSUME(gBattleMoves[MOVE_THUNDER_WAVE].category == BATTLE_CATEGORY_STATUS); PLAYER(SPECIES_JOLTEON) { Ability(ABILITY_VOLT_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/water_absorb.c b/test/battle/ability/water_absorb.c index cda3196034..2a811657e3 100644 --- a/test/battle/ability/water_absorb.c +++ b/test/battle/ability/water_absorb.c @@ -33,7 +33,7 @@ SINGLE_BATTLE_TEST("Water Absorb activates on status moves") { GIVEN { ASSUME(gBattleMoves[MOVE_SOAK].type == TYPE_WATER); - ASSUME(gBattleMoves[MOVE_SOAK].split == SPLIT_STATUS); + ASSUME(gBattleMoves[MOVE_SOAK].category == BATTLE_CATEGORY_STATUS); PLAYER(SPECIES_POLIWAG) { Ability(ABILITY_WATER_ABSORB); HP(1); MaxHP(100); } OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/ability/weak_armor.c b/test/battle/ability/weak_armor.c index 84cad5c222..207448049f 100644 --- a/test/battle/ability/weak_armor.c +++ b/test/battle/ability/weak_armor.c @@ -5,8 +5,8 @@ ASSUMPTIONS { ASSUME(gBattleMoves[MOVE_TACKLE].power != 0); ASSUME(gBattleMoves[MOVE_GUST].power != 0); - ASSUME(gBattleMoves[MOVE_GUST].split == SPLIT_SPECIAL); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); ASSUME(B_WEAK_ARMOR_SPEED >= GEN_7); } diff --git a/test/battle/ai.c b/test/battle/ai.c index 88e516fe3e..ce52ba53dd 100644 --- a/test/battle/ai.c +++ b/test/battle/ai.c @@ -405,7 +405,7 @@ AI_DOUBLE_BATTLE_TEST("AI will not use a status move if partner already chose He for (j = MOVE_NONE + 1; j < MOVES_COUNT; j++) { - if (gBattleMoves[j].split == SPLIT_STATUS) { + if (gBattleMoves[j].category == BATTLE_CATEGORY_STATUS) { PARAMETRIZE{ statusMove = j; } } } diff --git a/test/battle/hold_effect/jaboca_berry.c b/test/battle/hold_effect/jaboca_berry.c index d009ae03a6..19c9f7ce73 100644 --- a/test/battle/hold_effect/jaboca_berry.c +++ b/test/battle/hold_effect/jaboca_berry.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_JABOCA_BERRY].holdEffect == HOLD_EFFECT_JABOCA_BERRY); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Jaboca Berry causes the attacker to lose 1/8 of its max HP if a physical move was used") @@ -16,7 +16,7 @@ SINGLE_BATTLE_TEST("Jaboca Berry causes the attacker to lose 1/8 of its max HP i PARAMETRIZE { move = MOVE_TACKLE; } GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_JABOCA_BERRY); } } WHEN { @@ -44,7 +44,7 @@ SINGLE_BATTLE_TEST("Jaboca Berry tirggers before Bug Bite can steal it") { KNOWN_FAILING; GIVEN { - ASSUME(gBattleMoves[MOVE_BUG_BITE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_BUG_BITE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WYNAUT); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_JABOCA_BERRY); } } WHEN { diff --git a/test/battle/hold_effect/kee_berry.c b/test/battle/hold_effect/kee_berry.c index c172a2c940..820cb60467 100644 --- a/test/battle/hold_effect/kee_berry.c +++ b/test/battle/hold_effect/kee_berry.c @@ -4,7 +4,7 @@ ASSUMPTIONS { ASSUME(gItems[ITEM_KEE_BERRY].holdEffect == HOLD_EFFECT_KEE_BERRY); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); } SINGLE_BATTLE_TEST("Kee Berry raises the holder's Defense by one stage when hit by a physical move") @@ -15,7 +15,7 @@ SINGLE_BATTLE_TEST("Kee Berry raises the holder's Defense by one stage when hit PARAMETRIZE { move = MOVE_TACKLE; } GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_KEE_BERRY); } } WHEN { @@ -58,7 +58,7 @@ SINGLE_BATTLE_TEST("Kee Berry raises the holder's Defense by two stages with Rip SINGLE_BATTLE_TEST("Kee Berry is not triggered by a special move") { GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_KEE_BERRY); } } WHEN { diff --git a/test/battle/hold_effect/maranga_berry.c b/test/battle/hold_effect/maranga_berry.c index d29dc60d1e..779d602d6a 100644 --- a/test/battle/hold_effect/maranga_berry.c +++ b/test/battle/hold_effect/maranga_berry.c @@ -12,8 +12,8 @@ SINGLE_BATTLE_TEST("Maranga Berry raises the holder's Sp. Def by one stage when PARAMETRIZE { move = MOVE_TACKLE; } PARAMETRIZE { move = MOVE_SWIFT; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_SWIFT].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_MARANGA_BERRY); } } WHEN { @@ -40,7 +40,7 @@ SINGLE_BATTLE_TEST("Maranga Berry raises the holder's Sp. Def by one stage when SINGLE_BATTLE_TEST("Maranga Berry raises the holder's Sp. Def by two stages with Ripen when hit by a special move") { GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_APPLIN) { Item(ITEM_MARANGA_BERRY); Ability(ABILITY_RIPEN); } } WHEN { diff --git a/test/battle/hold_effect/rowap_berry.c b/test/battle/hold_effect/rowap_berry.c index d019a0f77b..5e4d603f5d 100644 --- a/test/battle/hold_effect/rowap_berry.c +++ b/test/battle/hold_effect/rowap_berry.c @@ -15,8 +15,8 @@ SINGLE_BATTLE_TEST("Rowap Berry causes the attacker to lose 1/8 of its max HP if PARAMETRIZE { move = MOVE_TACKLE; } GIVEN { - ASSUME(gBattleMoves[MOVE_SWIFT].split == SPLIT_SPECIAL); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_SWIFT].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_ROWAP_BERRY); } } WHEN { @@ -43,7 +43,7 @@ SINGLE_BATTLE_TEST("Rowap Berry causes the attacker to lose 1/8 of its max HP if SINGLE_BATTLE_TEST("Rowap Berry is not triggered by a physical move") { GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET) { Item(ITEM_ROWAP_BERRY); } } WHEN { diff --git a/test/battle/move.c b/test/battle/move.c index 7174df23ef..1f0d5765d6 100644 --- a/test/battle/move.c +++ b/test/battle/move.c @@ -136,7 +136,7 @@ SINGLE_BATTLE_TEST("Critical hits do not ignore positive stat stages", s16 damag PARAMETRIZE { move = MOVE_HOWL; } PARAMETRIZE { move = MOVE_TAIL_WHIP; } GIVEN { - ASSUME(gBattleMoves[MOVE_SCRATCH].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_SCRATCH].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -157,7 +157,7 @@ SINGLE_BATTLE_TEST("Critical hits ignore negative stat stages", s16 damage) PARAMETRIZE { move = MOVE_HARDEN; } PARAMETRIZE { move = MOVE_GROWL; } GIVEN { - ASSUME(gBattleMoves[MOVE_SCRATCH].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_SCRATCH].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/attack_down.c b/test/battle/move_effect/attack_down.c index 2149624c84..7f32b9f47b 100644 --- a/test/battle/move_effect/attack_down.c +++ b/test/battle/move_effect/attack_down.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Growl lowers Attack", s16 damage) PARAMETRIZE { lowerAttack = FALSE; } PARAMETRIZE { lowerAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/attack_up.c b/test/battle/move_effect/attack_up.c index 7cd8f953c7..967c850c12 100644 --- a/test/battle/move_effect/attack_up.c +++ b/test/battle/move_effect/attack_up.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Meditate raises Attack", s16 damage) PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/attack_up_user_ally.c b/test/battle/move_effect/attack_up_user_ally.c index 4b7fdae084..4317040bc2 100644 --- a/test/battle/move_effect/attack_up_user_ally.c +++ b/test/battle/move_effect/attack_up_user_ally.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Howl raises user's Attack", s16 damage) PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { @@ -37,7 +37,7 @@ DOUBLE_BATTLE_TEST("Howl raises user's and partner's Attack", s16 damageLeft, s1 PARAMETRIZE { raiseAttack = FALSE; } PARAMETRIZE { raiseAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Speed(15); } PLAYER(SPECIES_WYNAUT) { Speed(10); } OPPONENT(SPECIES_WOBBUFFET) { Speed(13); } @@ -69,7 +69,7 @@ DOUBLE_BATTLE_TEST("Howl does not work on partner if it has Soundproof") s16 damage[2]; GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET) { Speed(15); } PLAYER(SPECIES_VOLTORB) { Speed(10); Ability(ABILITY_SOUNDPROOF); } OPPONENT(SPECIES_WOBBUFFET) { Speed(5); } diff --git a/test/battle/move_effect/defense_down.c b/test/battle/move_effect/defense_down.c index 8a8c69ec3c..dfc9628f55 100644 --- a/test/battle/move_effect/defense_down.c +++ b/test/battle/move_effect/defense_down.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Tail Whip lowers Defense", s16 damage) PARAMETRIZE { lowerDefense = FALSE; } PARAMETRIZE { lowerDefense = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/defense_up.c b/test/battle/move_effect/defense_up.c index b4c7cb4dbb..6b18ecc934 100644 --- a/test/battle/move_effect/defense_up.c +++ b/test/battle/move_effect/defense_up.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Harden raises Defense", s16 damage) PARAMETRIZE { raiseDefense = FALSE; } PARAMETRIZE { raiseDefense = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/defog.c b/test/battle/move_effect/defog.c index 1cd78fb505..635fe822c4 100644 --- a/test/battle/move_effect/defog.c +++ b/test/battle/move_effect/defog.c @@ -15,8 +15,8 @@ ASSUMPTIONS ASSUME(gBattleMoves[MOVE_STICKY_WEB].effect == EFFECT_STICKY_WEB); ASSUME(gBattleMoves[MOVE_TOXIC].effect == EFFECT_TOXIC); ASSUME(gBattleMoves[MOVE_SCREECH].effect == EFFECT_DEFENSE_DOWN_2); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_GUST].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); } SINGLE_BATTLE_TEST("Defog lowers evasiveness by 1") diff --git a/test/battle/move_effect/haze.c b/test/battle/move_effect/haze.c index f1e4456aac..f386110ef1 100644 --- a/test/battle/move_effect/haze.c +++ b/test/battle/move_effect/haze.c @@ -13,7 +13,7 @@ SINGLE_BATTLE_TEST("Haze resets stat changes", s16 damage) PARAMETRIZE { haze = TRUE; } GIVEN { ASSUME(gBattleMoves[MOVE_MEDITATE].effect == EFFECT_ATTACK_UP); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/protect.c b/test/battle/move_effect/protect.c index 69e2ed3489..502eab46e0 100644 --- a/test/battle/move_effect/protect.c +++ b/test/battle/move_effect/protect.c @@ -12,10 +12,10 @@ ASSUMPTIONS ASSUME(gBattleMoves[MOVE_QUICK_GUARD].effect == EFFECT_PROTECT); ASSUME(gBattleMoves[MOVE_CRAFTY_SHIELD].effect == EFFECT_PROTECT); ASSUME(gBattleMoves[MOVE_BANEFUL_BUNKER].effect == EFFECT_PROTECT); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); ASSUME(gBattleMoves[MOVE_TACKLE].makesContact); - ASSUME(gBattleMoves[MOVE_LEER].split == SPLIT_STATUS); - ASSUME(gBattleMoves[MOVE_WATER_GUN].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_LEER].category == BATTLE_CATEGORY_STATUS); + ASSUME(gBattleMoves[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); ASSUME(!(gBattleMoves[MOVE_WATER_GUN].makesContact)); } @@ -421,7 +421,7 @@ DOUBLE_BATTLE_TEST("Crafty Shield protects self and ally from status moves") GIVEN { ASSUME(gBattleMoves[MOVE_LEER].target == MOVE_TARGET_BOTH); ASSUME(gBattleMoves[MOVE_HYPER_VOICE].target == MOVE_TARGET_BOTH); - ASSUME(gBattleMoves[MOVE_HYPER_VOICE].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_HYPER_VOICE].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); diff --git a/test/battle/move_effect/shell_trap.c b/test/battle/move_effect/shell_trap.c index 7fb80210eb..9d582c78be 100644 --- a/test/battle/move_effect/shell_trap.c +++ b/test/battle/move_effect/shell_trap.c @@ -4,9 +4,9 @@ ASSUMPTIONS { ASSUME(gBattleMoves[MOVE_SHELL_TRAP].effect == EFFECT_SHELL_TRAP); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_WATER_GUN].split == SPLIT_SPECIAL); - ASSUME(gBattleMoves[MOVE_LEER].split == SPLIT_STATUS); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_WATER_GUN].category == BATTLE_CATEGORY_SPECIAL); + ASSUME(gBattleMoves[MOVE_LEER].category == BATTLE_CATEGORY_STATUS); } SINGLE_BATTLE_TEST("Shell Trap activates only if hit by a physical move") diff --git a/test/battle/move_effect/special_attack_down.c b/test/battle/move_effect/special_attack_down.c index 6e7a84f0a4..72f554de1d 100644 --- a/test/battle/move_effect/special_attack_down.c +++ b/test/battle/move_effect/special_attack_down.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Confide lowers Special Attack", s16 damage) PARAMETRIZE { lowerSpecialAttack = FALSE; } PARAMETRIZE { lowerSpecialAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_GUST].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/special_attack_up_3.c b/test/battle/move_effect/special_attack_up_3.c index 340c59360b..404469139d 100644 --- a/test/battle/move_effect/special_attack_up_3.c +++ b/test/battle/move_effect/special_attack_up_3.c @@ -12,7 +12,7 @@ SINGLE_BATTLE_TEST("Tail Glow drastically raises Special Attack", s16 damage) PARAMETRIZE { raiseSpecialAttack = FALSE; } PARAMETRIZE { raiseSpecialAttack = TRUE; } GIVEN { - ASSUME(gBattleMoves[MOVE_GUST].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET); OPPONENT(SPECIES_WOBBUFFET); } WHEN { diff --git a/test/battle/move_effect/stockpile.c b/test/battle/move_effect/stockpile.c index e5f108a16d..f793d14309 100644 --- a/test/battle/move_effect/stockpile.c +++ b/test/battle/move_effect/stockpile.c @@ -148,8 +148,8 @@ SINGLE_BATTLE_TEST("Stockpile temporarily raises Def and Sp. Def", s16 dmgPyhsic PARAMETRIZE { move = MOVE_CELEBRATE; } GIVEN { ASSUME(B_STOCKPILE_RAISES_DEFS >= GEN_4); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_GUST].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) { Speed(2); } OPPONENT(SPECIES_WOBBUFFET) { Speed(1); } } WHEN { @@ -184,8 +184,8 @@ DOUBLE_BATTLE_TEST("Stockpile's Def and Sp. Def boost is lost after using Spit U PARAMETRIZE { count = 3; move = MOVE_SPIT_UP; } GIVEN { ASSUME(B_STOCKPILE_RAISES_DEFS >= GEN_4); - ASSUME(gBattleMoves[MOVE_TACKLE].split == SPLIT_PHYSICAL); - ASSUME(gBattleMoves[MOVE_GUST].split == SPLIT_SPECIAL); + ASSUME(gBattleMoves[MOVE_TACKLE].category == BATTLE_CATEGORY_PHYSICAL); + ASSUME(gBattleMoves[MOVE_GUST].category == BATTLE_CATEGORY_SPECIAL); PLAYER(SPECIES_WOBBUFFET) { Speed(4); HP(399); MaxHP(400); } PLAYER(SPECIES_WOBBUFFET) { Speed(3); } OPPONENT(SPECIES_WOBBUFFET) { Speed(2); }