diff --git a/constants/battle_move_constants.inc b/constants/battle_move_constants.inc deleted file mode 100644 index a05da3db3..000000000 --- a/constants/battle_move_constants.inc +++ /dev/null @@ -1,15 +0,0 @@ - .set TARGET_SELECTED_POKEMON, 0 - - .set F_TARGET_SPECIAL, 1 << 0 - .set F_TARGET_RANDOM, 1 << 2 - .set F_TARGET_BOTH_ENEMIES, 1 << 3 - .set F_TARGET_USER, 1 << 4 - .set F_TARGET_ALL_EXCEPT_USER, 1 << 5 - .set F_TARGET_ENEMY_SIDE, 1 << 6 - - .set F_MAKES_CONTACT, 1 << 0 - .set F_AFFECTED_BY_PROTECT, 1 << 1 - .set F_AFFECTED_BY_MAGIC_COAT, 1 << 2 - .set F_AFFECTED_BY_SNATCH, 1 << 3 - .set F_MIRROR_MOVE_COMPATIBLE, 1 << 4 - .set F_AFFECTED_BY_KINGS_ROCK, 1 << 5 diff --git a/constants/constants.inc b/constants/constants.inc index 10d582eb1..28f2b2658 100644 --- a/constants/constants.inc +++ b/constants/constants.inc @@ -3,7 +3,6 @@ .include "constants/contest_constants.inc" .include "constants/pokemon_data_constants.inc" .include "constants/item_data_constants.inc" - .include "constants/battle_move_constants.inc" .include "constants/battle_frontier_constants.inc" .include "constants/map_constants.inc" .include "constants/berry_constants.inc" diff --git a/include/battle.h b/include/battle.h index 5225b72e3..971b9e4f5 100644 --- a/include/battle.h +++ b/include/battle.h @@ -66,14 +66,14 @@ #define MSG_DISPLAY 0x7 #define BATTLE_COMMUNICATION_ENTRIES_COUNT 0x8 -#define MOVE_TARGET_SELECTED 0x0 -#define MOVE_TARGET_DEPENDS 0x1 -#define MOVE_TARGET_USER 0x2 -#define MOVE_TARGET_RANDOM 0x4 -#define MOVE_TARGET_x10 0x10 -#define MOVE_TARGET_BOTH 0x8 -#define MOVE_TARGET_FOES_AND_ALLY 0x20 -#define MOVE_TARGET_OPPONENTS_FIELD 0x40 +#define MOVE_TARGET_SELECTED 0x0 +#define MOVE_TARGET_DEPENDS 0x1 +#define MOVE_TARGET_USER_OR_SELECTED 0x2 +#define MOVE_TARGET_RANDOM 0x4 +#define MOVE_TARGET_BOTH 0x8 +#define MOVE_TARGET_USER 0x10 +#define MOVE_TARGET_FOES_AND_ALLY 0x20 +#define MOVE_TARGET_OPPONENTS_FIELD 0x40 // defines for the u8 array gTypeEffectiveness #define TYPE_EFFECT_ATK_TYPE(i)((gTypeEffectiveness[i + 0])) diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h index 1b59f2f64..b54f01353 100644 --- a/include/constants/battle_move_effects.h +++ b/include/constants/battle_move_effects.h @@ -151,7 +151,7 @@ #define EFFECT_EARTHQUAKE 147 #define EFFECT_FUTURE_SIGHT 148 #define EFFECT_GUST 149 -#define EFFECT_FLINCH_HIT_2 150 // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM +#define EFFECT_FLINCH_MINIMIZE_HIT 150 // STOMP ASTONISH EXTRASENSORY NEEDLE_ARM #define EFFECT_SOLARBEAM 151 #define EFFECT_THUNDER 152 #define EFFECT_TELEPORT 153 diff --git a/include/data/battle_moves.h b/include/data/battle_moves.h index ba3ca1ce1..6489fe07f 100644 --- a/include/data/battle_moves.h +++ b/include/data/battle_moves.h @@ -164,7 +164,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -257,7 +257,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, { // MOVE_STOMP - .effect = EFFECT_FLINCH_HIT_2, + .effect = EFFECT_FLINCH_MINIMIZE_HIT, .power = 65, .type = TYPE_NORMAL, .accuracy = 100, @@ -604,7 +604,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -824,7 +824,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 40, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1066,7 +1066,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 40, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1077,7 +1077,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1110,7 +1110,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -1154,7 +1154,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 15, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1165,7 +1165,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1176,7 +1176,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1187,7 +1187,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1220,7 +1220,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 40, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1231,7 +1231,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 40, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1242,7 +1242,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1253,7 +1253,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1264,7 +1264,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, @@ -1275,7 +1275,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1286,7 +1286,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1297,7 +1297,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, @@ -1473,7 +1473,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1495,7 +1495,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, @@ -1660,7 +1660,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 40, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -1671,7 +1671,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 40, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1726,7 +1726,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1759,7 +1759,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1770,7 +1770,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -1814,7 +1814,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -1946,7 +1946,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 30, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -2012,7 +2012,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 3, .flags = 0, }, @@ -2067,7 +2067,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -2144,7 +2144,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -2155,7 +2155,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -2177,7 +2177,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 3, .flags = 0, }, @@ -2221,7 +2221,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -2243,7 +2243,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 3, .flags = 0, }, @@ -2298,7 +2298,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_SNATCH_AFFECTED, }, @@ -2375,7 +2375,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -2419,7 +2419,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 25, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -2496,7 +2496,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 40, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -2584,7 +2584,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -2595,7 +2595,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -2606,7 +2606,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -2650,7 +2650,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -2661,7 +2661,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -2804,7 +2804,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -2826,7 +2826,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -2848,7 +2848,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, @@ -2936,7 +2936,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 3, .flags = 0, }, @@ -2958,7 +2958,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -2980,7 +2980,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 5, .flags = 0, }, @@ -3013,7 +3013,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, @@ -3035,7 +3035,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3068,7 +3068,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -3156,7 +3156,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_PROTECT_AFFECTED, }, @@ -3167,7 +3167,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3178,7 +3178,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED, }, @@ -3233,7 +3233,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3244,7 +3244,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3310,7 +3310,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 15, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -3326,7 +3326,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, { // MOVE_NEEDLE_ARM - .effect = EFFECT_FLINCH_HIT_2, + .effect = EFFECT_FLINCH_MINIMIZE_HIT, .power = 60, .type = TYPE_GRASS, .accuracy = 100, @@ -3343,7 +3343,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 10, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3414,7 +3414,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, { // MOVE_ASTONISH - .effect = EFFECT_FLINCH_HIT_2, + .effect = EFFECT_FLINCH_MINIMIZE_HIT, .power = 30, .type = TYPE_GHOST, .accuracy = 100, @@ -3442,7 +3442,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 5, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3552,7 +3552,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3590,7 +3590,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .flags = FLAG_MAKES_CONTACT | FLAG_PROTECT_AFFECTED | FLAG_MIRROR_MOVE_AFFECTED | FLAG_KINGSROCK_AFFECTED, }, { // MOVE_EXTRASENSORY - .effect = EFFECT_FLINCH_HIT_2, + .effect = EFFECT_FLINCH_MINIMIZE_HIT, .power = 80, .type = TYPE_PSYCHIC, .accuracy = 100, @@ -3684,7 +3684,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 15, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3706,7 +3706,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 40, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3739,7 +3739,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3816,7 +3816,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 100, .pp = 15, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = 0, }, @@ -3827,7 +3827,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, @@ -3849,7 +3849,7 @@ const struct BattleMove gBattleMoves[LAST_MOVE_INDEX + 1] = .accuracy = 0, .pp = 20, .secondaryEffectChance = 0, - .target = MOVE_TARGET_x10, + .target = MOVE_TARGET_USER, .priority = 0, .flags = FLAG_SNATCH_AFFECTED, }, diff --git a/include/pokemon.h b/include/pokemon.h index 6df9ce313..cd79a217d 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -468,6 +468,7 @@ extern struct Pokemon gEnemyParty[PARTY_SIZE]; extern struct SpriteTemplate gUnknown_0202499C; extern struct PokemonStorage* gPokemonStoragePtr; +extern const struct BattleMove gBattleMoves[]; extern const u8 gFacilityClassToPicIndex[]; extern const u8 gFacilityClassToTrainerClass[]; extern const struct BaseStats gBaseStats[]; diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index d6ccf9305..3b45b97c8 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -45,7 +45,6 @@ in order to read the next command correctly. refer to battle_ai_scripts.s for th AI scripts. */ -extern const struct BattleMove gBattleMoves[]; extern const u8 * const gBattleAI_ScriptsTable[]; extern u32 GetAiScriptsInRecordedBattle(); diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index c3bb0d422..9dfbd0723 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -9,7 +9,6 @@ #include "util.h" #include "constants/items.h" -extern const struct BattleMove gBattleMoves[]; extern const u8 gTypeEffectiveness[]; extern const u8 * const gItemEffectTable[]; // todo: fix once struct is declared diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index a399adf25..7bfc83977 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -32,7 +32,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; -extern const struct BattleMove gBattleMoves[]; extern void sub_8172EF0(u8 bank, struct Pokemon *mon); extern void sub_806A068(u16, u8); diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index 1734abe62..b74cb859f 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -31,7 +31,6 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern const struct BattleMove gBattleMoves[]; extern void sub_8172EF0(u8 bank, struct Pokemon *mon); extern void sub_806A068(u16, u8); diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 26e0191cb..69df6b66b 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -35,7 +35,6 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM; extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; -extern const struct BattleMove gBattleMoves[]; extern void sub_8172EF0(u8 bank, struct Pokemon *mon); extern void sub_806A068(u16, u8); @@ -1563,7 +1562,7 @@ static void OpponentHandleChooseMove(void) BtlController_EmitTwoReturnValues(1, 15, gBattlerTarget); break; default: - if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_USER | MOVE_TARGET_x10)) + if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_USER_OR_SELECTED | MOVE_TARGET_USER)) gBattlerTarget = gActiveBattler; if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH) { @@ -1585,7 +1584,7 @@ static void OpponentHandleChooseMove(void) move = moveInfo->moves[chosenMoveId]; } while (move == MOVE_NONE); - if (gBattleMoves[move].target & (MOVE_TARGET_USER | MOVE_TARGET_x10)) + if (gBattleMoves[move].target & (MOVE_TARGET_USER_OR_SELECTED | MOVE_TARGET_USER)) BtlController_EmitTwoReturnValues(1, 10, (chosenMoveId) | (gActiveBattler << 8)); else if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) BtlController_EmitTwoReturnValues(1, 10, (chosenMoveId) | (GetBattlerAtPosition(Random() & 2) << 8)); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 8847715f6..19017e12c 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -43,7 +43,6 @@ extern struct SpriteTemplate gUnknown_0202499C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; extern const u8 gTypeNames[][7]; -extern const struct BattleMove gBattleMoves[]; extern const u8 gText_BattleSwitchWhich[]; extern const u8 gText_MoveInterfacePP[]; @@ -432,7 +431,7 @@ static void HandleInputChooseTarget(void) case B_POSITION_PLAYER_RIGHT: if (gActiveBattler != gMultiUsePlayerCursor) i++; - else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler])].target & MOVE_TARGET_USER) + else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler])].target & MOVE_TARGET_USER_OR_SELECTED) i++; break; case B_POSITION_OPPONENT_LEFT: @@ -474,7 +473,7 @@ static void HandleInputChooseTarget(void) case B_POSITION_PLAYER_RIGHT: if (gActiveBattler != gMultiUsePlayerCursor) i++; - else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler])].target & MOVE_TARGET_USER) + else if (gBattleMoves[GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_MOVE1 + gMoveSelectionCursor[gActiveBattler])].target & MOVE_TARGET_USER_OR_SELECTED) i++; break; case B_POSITION_OPPONENT_LEFT: @@ -508,7 +507,7 @@ static void HandleInputChooseMove(void) if (moveInfo->moves[gMoveSelectionCursor[gActiveBattler]] == MOVE_CURSE) { if (moveInfo->monType1 != TYPE_GHOST && moveInfo->monType2 != TYPE_GHOST) - moveTarget = MOVE_TARGET_x10; + moveTarget = MOVE_TARGET_USER; else moveTarget = MOVE_TARGET_SELECTED; } @@ -517,26 +516,26 @@ static void HandleInputChooseMove(void) moveTarget = gBattleMoves[moveInfo->moves[gMoveSelectionCursor[gActiveBattler]]].target; } - if (moveTarget & MOVE_TARGET_x10) + if (moveTarget & MOVE_TARGET_USER) gMultiUsePlayerCursor = gActiveBattler; else gMultiUsePlayerCursor = GetBattlerAtPosition((GetBattlerPosition(gActiveBattler) & BIT_SIDE) ^ BIT_SIDE); if (!gBattleBufferA[gActiveBattler][1]) // not a double battle { - if (moveTarget & MOVE_TARGET_USER && !gBattleBufferA[gActiveBattler][2]) + if (moveTarget & MOVE_TARGET_USER_OR_SELECTED && !gBattleBufferA[gActiveBattler][2]) canSelectTarget++; } else // double battle { - if (!(moveTarget & (MOVE_TARGET_RANDOM | MOVE_TARGET_BOTH | MOVE_TARGET_DEPENDS | MOVE_TARGET_FOES_AND_ALLY | MOVE_TARGET_OPPONENTS_FIELD | MOVE_TARGET_x10))) + if (!(moveTarget & (MOVE_TARGET_RANDOM | MOVE_TARGET_BOTH | MOVE_TARGET_DEPENDS | MOVE_TARGET_FOES_AND_ALLY | MOVE_TARGET_OPPONENTS_FIELD | MOVE_TARGET_USER))) canSelectTarget++; // either selected or user if (moveInfo->currentPp[gMoveSelectionCursor[gActiveBattler]] == 0) { canSelectTarget = FALSE; } - else if (!(moveTarget & (MOVE_TARGET_x10 | MOVE_TARGET_USER)) && CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) <= 1) + else if (!(moveTarget & (MOVE_TARGET_USER | MOVE_TARGET_USER_OR_SELECTED)) && CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) <= 1) { gMultiUsePlayerCursor = GetDefaultMoveTarget(gActiveBattler); canSelectTarget = FALSE; @@ -552,7 +551,7 @@ static void HandleInputChooseMove(void) { gBattlerControllerFuncs[gActiveBattler] = HandleInputChooseTarget; - if (moveTarget & (MOVE_TARGET_x10 | MOVE_TARGET_USER)) + if (moveTarget & (MOVE_TARGET_USER | MOVE_TARGET_USER_OR_SELECTED)) gMultiUsePlayerCursor = gActiveBattler; else if (gAbsentBattlerFlags & gBitTable[GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT)]) gMultiUsePlayerCursor = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c index d2f85f85e..7569604d8 100644 --- a/src/battle_controller_player_partner.c +++ b/src/battle_controller_player_partner.c @@ -31,7 +31,6 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern const struct BattleMove gBattleMoves[]; extern void sub_81358F4(void); extern void sub_8172EF0(u8 bank, struct Pokemon *mon); @@ -1521,7 +1520,7 @@ static void PlayerPartnerHandleChooseMove(void) BattleAI_SetupAIData(0xF); chosenMoveId = BattleAI_ChooseMoveOrAction(); - if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_x10 | MOVE_TARGET_USER)) + if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & (MOVE_TARGET_USER | MOVE_TARGET_USER_OR_SELECTED)) gBattlerTarget = gActiveBattler; if (gBattleMoves[moveInfo->moves[chosenMoveId]].target & MOVE_TARGET_BOTH) { diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c index 0d06e26eb..c1e5447a4 100644 --- a/src/battle_controller_recorded_player.c +++ b/src/battle_controller_recorded_player.c @@ -34,7 +34,6 @@ extern struct UnusedControllerStruct gUnknown_02022D0C; extern const struct CompressedSpritePalette gTrainerFrontPicPaletteTable[]; extern const struct CompressedSpritePalette gTrainerBackPicPaletteTable[]; -extern const struct BattleMove gBattleMoves[]; extern void sub_8172EF0(u8 bank, struct Pokemon *mon); extern void sub_806A068(u16, u8); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 3c8b1563f..cc366908a 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -36,7 +36,6 @@ extern u8 gBattleBuffersTransferData[0x100]; static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {}; -extern const struct BattleMove gBattleMoves[]; extern void task00_08081A90(u8 taskId); // cable_club extern void sub_81B8D64(u8 bank, u8 arg1); // party_menu diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 4dc88ab6a..d2c242553 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -28,7 +28,6 @@ extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE2; extern struct MusicPlayerInfo gMPlayInfo_BGM; -extern const struct BattleMove gBattleMoves[]; extern const u8 gUnknown_0831C604[]; extern const u8 * const gBattleAnims_VariousTable[]; extern const u8 * const gBattleAnims_Special[]; @@ -237,7 +236,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void) if (moveInfo->moves[chosenMoveId] == MOVE_CURSE) { if (moveInfo->monType1 != TYPE_GHOST && moveInfo->monType2 != TYPE_GHOST) - var1 = MOVE_TARGET_x10; + var1 = MOVE_TARGET_USER; else var1 = MOVE_TARGET_SELECTED; } @@ -246,7 +245,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void) var1 = gBattleMoves[moveInfo->moves[chosenMoveId]].target; } - if (var1 & MOVE_TARGET_x10) + if (var1 & MOVE_TARGET_USER) chosenMoveId |= (gActiveBattler << 8); else if (var1 == MOVE_TARGET_SELECTED) chosenMoveId |= (BattlePalaceGetTargetRetValue()); @@ -261,7 +260,7 @@ static u8 sub_805D4A8(u16 move) switch (gBattleMoves[move].target) { case MOVE_TARGET_SELECTED: - case MOVE_TARGET_USER: + case MOVE_TARGET_USER_OR_SELECTED: case MOVE_TARGET_RANDOM: case MOVE_TARGET_BOTH: case MOVE_TARGET_FOES_AND_ALLY: @@ -273,7 +272,7 @@ static u8 sub_805D4A8(u16 move) case MOVE_TARGET_DEPENDS: case MOVE_TARGET_OPPONENTS_FIELD: return 2; - case MOVE_TARGET_x10: + case MOVE_TARGET_USER: return 1; default: return 0; diff --git a/src/battle_main.c b/src/battle_main.c index 78b69212d..09a4268cd 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -81,7 +81,6 @@ extern struct MusicPlayerInfo gMPlayInfo_SE1; extern struct MusicPlayerInfo gMPlayInfo_SE2; extern u8 gUnknown_0203CF00[]; -extern const struct BattleMove gBattleMoves[]; extern const u16 gBattleTextboxPalette[]; // battle textbox palette extern const struct BgTemplate gUnknown_0831AA08[]; extern const struct WindowTemplate * const gUnknown_0831ABA0[]; @@ -5133,7 +5132,7 @@ static void HandleAction_UseMove(void) else if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && gSideTimers[side].followmeTimer == 0 && (gBattleMoves[gCurrentMove].power != 0 - || gBattleMoves[gCurrentMove].target != MOVE_TARGET_x10) + || gBattleMoves[gCurrentMove].target != MOVE_TARGET_USER) && gBattleMons[*(gBattleStruct->moveTarget + gBattlerAttacker)].ability != ABILITY_LIGHTNING_ROD && gBattleMoves[gCurrentMove].type == TYPE_ELECTRIC) { diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 2da48de49..6dbf5955b 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -54,7 +54,6 @@ struct TrainerMoney u8 value; }; -extern const struct BattleMove gBattleMoves[]; extern const u8 gTypeEffectiveness[336]; extern const struct TrainerMoney gTrainerMoneyTable[]; extern const u8* const gBattleScriptsForMoveEffects[]; diff --git a/src/battle_util.c b/src/battle_util.c index a457ce15d..662e5b2a6 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -23,7 +23,6 @@ #include "link.h" #include "berry.h" -extern const struct BattleMove gBattleMoves[]; extern u8 weather_get_current(void); @@ -3255,8 +3254,8 @@ u8 GetMoveTarget(u16 move, u8 useMoveTarget) else targetBank = GetBattlerAtPosition((GetBattlerPosition(gBattlerAttacker) & BIT_SIDE) ^ BIT_SIDE); break; + case MOVE_TARGET_USER_OR_SELECTED: case MOVE_TARGET_USER: - case MOVE_TARGET_x10: targetBank = gBattlerAttacker; break; } diff --git a/src/item_menu.c b/src/item_menu.c index e88d1c2d3..9090a39c5 100755 --- a/src/item_menu.c +++ b/src/item_menu.c @@ -328,7 +328,6 @@ extern u8* gReturnToXStringsTable[]; extern u32 gUnknown_0203CE5E[]; extern u8 EventScript_2736B3[]; extern const u16 gUnknown_0860F074[]; -extern struct BattleMove gBattleMoves[]; void ResetBagScrollPositions(void) { diff --git a/src/pokemon.c b/src/pokemon.c index dd2869765..e9a091c36 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -67,7 +67,6 @@ extern const union AnimCmd *gUnknown_082FF70C[]; extern const union AnimCmd *const *const gMonAnimationsSpriteAnimsPtrTable[]; extern const union AnimCmd *const *const gUnknown_08305D0C[]; extern const union AnimCmd *const *const gUnknown_0830536C[]; -extern const struct BattleMove gBattleMoves[]; extern const u8 gSpeciesNames[][POKEMON_NAME_LENGTH + 1]; extern const struct UnknownPokemonStruct3 gUnknown_08610970[]; extern const struct CompressedSpritePalette gMonPaletteTable[]; diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 1e5245d70..7f5a983d2 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -146,7 +146,6 @@ extern u8 gText_OneDash[]; extern u8 gText_TwoDashes[]; extern u8 gText_ThreeDashes[]; extern u8 gUnknown_0861CE97[]; -extern struct BattleMove gBattleMoves[]; extern void sub_8199C30(u8 a, u8 b, u8 c, u8 d, u8 e, u8 f); extern bool8 sub_81A6BF4();