Merge branch 'BattleEngine' into BE_config

# Conflicts: # include/constants/battle_config.h
2026-10-25 10:39:05 -05:00 · 2021-10-23 19:46:33 -03:00
parent 4572e62669 abb8a97d21
commit d95351dd97
40 changed files with 1337 additions and 274 deletions
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -169,10 +169,12 @@
 #define STATUS3_HEAL_BLOCK              (1 << 27)
 #define STATUS3_AQUA_RING               (1 << 28)
 #define STATUS3_LASER_FOCUS             (1 << 29)
-#define STATUS3_ELECTRIFIED             (1 << 30)
-#define STATUS3_POWER_TRICK             (1 << 31)
+#define STATUS3_POWER_TRICK             (1 << 30)
 #define STATUS3_SEMI_INVULNERABLE       (STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER | STATUS3_PHANTOM_FORCE)

+#define STATUS4_ELECTRIFIED             (1 << 0)
+#define STATUS4_PLASMA_FISTS            (1 << 1)
+
 #define HITMARKER_x10                   (1 << 4)
 #define HITMARKER_x20                   (1 << 5)
 #define HITMARKER_DESTINYBOND           (1 << 6)
@@ -386,5 +388,6 @@
 #define MOVE_TARGET_FOES_AND_ALLY       0x20
 #define MOVE_TARGET_OPPONENTS_FIELD     0x40
 #define MOVE_TARGET_ALLY                0x80
+#define MOVE_TARGET_ALL_BATTLERS        (0x100 | MOVE_TARGET_USER)

 #endif // GUARD_CONSTANTS_BATTLE_H
--- a/include/constants/battle_anim.h
+++ b/include/constants/battle_anim.h
@@ -391,6 +391,9 @@
 #define ANIM_TAG_DREEPY                     (ANIM_SPRITES_START + 379)
 #define ANIM_TAG_ICE_ROCK_SINGLE            (ANIM_SPRITES_START + 380)
 #define ANIM_TAG_STONE_PILLAR_MULTI         (ANIM_SPRITES_START + 381)
+#define ANIM_TAG_ALPHA_SYMBOL               (ANIM_SPRITES_START + 382)
+#define ANIM_TAG_OMEGA_SYMBOL               (ANIM_SPRITES_START + 383)
+#define ANIM_TAG_PRIMAL_PARTICLES           (ANIM_SPRITES_START + 384)

 // battlers
 #define ANIM_ATTACKER    0
@@ -525,6 +528,7 @@
 #define B_ANIM_TOTEM_FLARE              28 // Totem boosts aura flare
 #define B_ANIM_GULP_MISSILE             29
 #define B_ANIM_STRONG_WINDS             30
+#define B_ANIM_PRIMAL_REVERSION         31

 // special animations table (gBattleAnims_Special)
 #define B_ANIM_LVL_UP                   0
--- a/include/constants/battle_config.h
+++ b/include/constants/battle_config.h
@@ -101,6 +101,8 @@
 #define B_RECOIL_IF_MISS_DMG        GEN_7 // In Gen5+, Jump Kick and High Jump Kick will always do half of the user's max HP when missing.
 #define B_PSYWAVE_DMG               GEN_7 // Psywave's damage formula. See Cmd_psywavedamageeffect.
 #define B_BADGE_BOOST               GEN_7 // In Gen4+, Gym Badges no longer boost a Pokémon's stats.
+#define B_MAX_LEVEL_EV_GAINS        GEN_7 // In Gen5+, Lv100 Pokémon can obtain Effort Values normally.
+#define B_RECALCULATE_STATS         GEN_7 // In Gen5+, the stats of the Pokémon who participate in battle are recalculated at the end of each battle.

 // Move data settings
 #define B_UPDATED_MOVE_DATA         GEN_8 // Updates move data in gBattleMoves, including Power, Accuracy, PP, stat changes, targets, chances of secondary effects, etc.
@@ -123,6 +125,8 @@
 #define B_CRASH_IF_TARGET_IMMUNE    GEN_7 // In Gen4+, The user of Jump Kick or High Jump Kick will "keep going and crash" if it attacks a target that is immune to the move.
 #define B_TAILWIND_TIMER            GEN_7 // In Gen5+, Tailwind lasts 4 turns instead of 3.
 #define B_MEMENTO_FAIL              GEN_7 // In Gen4+, Memento fails if there is no target or if the target is protected or behind substitute. But not if Atk/Sp. Atk are at -6.
+#define B_HIDDEN_POWER_DMG          GEN_7 // In Gen6+, Hidden Power's base power was set to always be 60. Before, it was determined by the mon's IVs.
+#define B_GLARE_GHOST               GEN_7 // In Gen4+, Glare can hit Ghost-type Pokémon normally.
 #define B_BLIZZARD_HAIL             GEN_7 // In Gen4+, Blizzard bypasses accuracy checks if it's hailing.

 // Ability settings
@@ -178,6 +182,7 @@
 #define B_POWDER_GRASS              GEN_7 // In Gen6+, Grass-type Pokémon are immune to powder and spore moves.
 #define B_STEEL_RESISTANCES         GEN_7 // In Gen6+, Steel-type Pokémon are no longer resistant to Dark-type and Ghost-type moves.
 #define B_THUNDERSTORM_TERRAIN      TRUE  // If TRUE, overworld Thunderstorm generates Rain and Electric Terrain as in Gen 8.
+#define B_SEMI_INVULNERABLE_CATCH   GEN_7 // In Gen4+, you cannot throw a ball against a Pokemon that is in a semi-invulnerable state (dig/fly/etc)

 // Animation Settings
 #define B_NEW_SWORD_PARTICLE            FALSE    // If set to TRUE, it updates Swords Dance's particle.
--- a/include/constants/battle_move_effects.h
+++ b/include/constants/battle_move_effects.h
@@ -364,7 +364,17 @@
 #define EFFECT_SNIPE_SHOT 358
 #define EFFECT_TRIPLE_HIT 359
 #define EFFECT_RECOIL_HP_25 360
+#define EFFECT_STUFF_CHEEKS 361
+#define EFFECT_GRAV_APPLE 362
+#define EFFECT_EVASION_UP_HIT 363
+#define EFFECT_DOUBLE_IRON_BASH 364
+#define EFFECT_GLITZY_GLOW 365
+#define EFFECT_BADDY_BAD 366
+#define EFFECT_SAPPY_SEED 367
+#define EFFECT_FREEZY_FROST 368
+#define EFFECT_SPARKLY_SWIRL 369
+#define EFFECT_PLASMA_FISTS 370

-#define NUM_BATTLE_MOVE_EFFECTS 361
+#define NUM_BATTLE_MOVE_EFFECTS 371

 #endif  // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -38,6 +38,7 @@
 #define sFIXED_ABILITY_POPUP gBattleScripting + 0x33
 #define sABILITY_OVERWRITE gBattleScripting + 0x34
 #define sSWITCH_CASE gBattleScripting + 0x36
+#define sBERRY_OVERRIDE gBattleScripting + 0x37

 #define cMULTISTRING_CHOOSER gBattleCommunication + 5
 #define cMISS_TYPE gBattleCommunication + 6
@@ -185,6 +186,13 @@
 #define VARIOUS_REMOVE_TERRAIN                  113
 #define VARIOUS_JUMP_IF_PRANKSTER_BLOCKED       114
 #define VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER     115
+#define VARIOUS_GET_ROTOTILLER_TARGETS          116
+#define VARIOUS_JUMP_IF_NOT_ROTOTILLER_AFFECTED 117
+#define VARIOUS_TRY_ACTIVATE_BATTLE_BOND        118
+#define VARIOUS_CONSUME_BERRY                   119
+#define VARIOUS_JUMP_IF_CANT_REVERT_TO_PRIMAL   120
+#define VARIOUS_HANDLE_PRIMAL_REVERSION         121
+#define VARIOUS_APPLY_PLASMA_FISTS              122

 // Cmd_manipulatedamage
 #define DMG_CHANGE_SIGN            0
--- a/include/constants/battle_string_ids.h
+++ b/include/constants/battle_string_ids.h
@@ -523,7 +523,7 @@
 #define STRINGID_GRASSYTERRAINHEALS                   519
 #define STRINGID_ELECTRICTERRAINPREVENTS              520
 #define STRINGID_PSYCHICTERRAINPREVENTS               521
-#define STRINGID_SAFETYGOOGLESPROTECTED               522
+#define STRINGID_SAFETYGOGGLESPROTECTED               522
 #define STRINGID_FLOWERVEILPROTECTED                  523
 #define STRINGID_SWEETVEILPROTECTED                   524
 #define STRINGID_AROMAVEILPROTECTED                   525
@@ -592,8 +592,10 @@
 #define STRINGID_STRONGWINDSDISSIPATED                588
 #define STRINGID_MYSTERIOUSAIRCURRENTBLOWSON          589
 #define STRINGID_ATTACKWEAKENEDBSTRONGWINDS           590
+#define STRINGID_STUFFCHEEKSCANTSELECT                592
+#define STRINGID_PKMNREVERTEDTOPRIMAL                 593

-#define BATTLESTRINGS_COUNT                           591
+#define BATTLESTRINGS_COUNT                           594

 // The below IDs are all indexes into battle message tables,
 // used to determine which of a set of messages to print.
--- a/include/constants/hold_effects.h
+++ b/include/constants/hold_effects.h
@@ -130,7 +130,7 @@
 // Gen6 hold effects
 #define HOLD_EFFECT_FAIRY_POWER     139
 #define HOLD_EFFECT_MEGA_STONE      140
-#define HOLD_EFFECT_SAFETY_GOOGLES  141
+#define HOLD_EFFECT_SAFETY_GOGGLES  141
 #define HOLD_EFFECT_LUMINOUS_MOSS   142
 #define HOLD_EFFECT_SNOWBALL        143
 #define HOLD_EFFECT_WEAKNESS_POLICY 144
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -336,25 +336,43 @@
 #define F_SUMMARY_SCREEN_FLIP_SPRITE 0x80

 // Evolution types
-#define EVO_MEGA_EVOLUTION      0xffff // Not an actual evolution, used to temporarily mega evolve in battle.
-#define EVO_MOVE_MEGA_EVOLUTION 0xfffe // Mega Evolution that checks for a move instead of held item.
-#define EVO_FRIENDSHIP       1      // Pokémon levels up with friendship ≥ 220
-#define EVO_FRIENDSHIP_DAY   2      // Pokémon levels up during the day with friendship ≥ 220
-#define EVO_FRIENDSHIP_NIGHT 3      // Pokémon levels up at night with friendship ≥ 220
-#define EVO_LEVEL            4      // Pokémon reaches the specified level
-#define EVO_TRADE            5      // Pokémon is traded
-#define EVO_TRADE_ITEM       6      // Pokémon is traded while it's holding the specified item
-#define EVO_ITEM             7      // specified item is used on Pokémon
-#define EVO_LEVEL_ATK_GT_DEF 8      // Pokémon reaches the specified level with attack > defense
-#define EVO_LEVEL_ATK_EQ_DEF 9      // Pokémon reaches the specified level with attack = defense
-#define EVO_LEVEL_ATK_LT_DEF 10     // Pokémon reaches the specified level with attack < defense
-#define EVO_LEVEL_SILCOON    11     // Pokémon reaches the specified level with a Silcoon personality value
-#define EVO_LEVEL_CASCOON    12     // Pokémon reaches the specified level with a Cascoon personality value
-#define EVO_LEVEL_NINJASK    13     // Pokémon reaches the specified level (special value for Ninjask)
-#define EVO_LEVEL_SHEDINJA   14     // Pokémon reaches the specified level (special value for Shedinja)
-#define EVO_BEAUTY           15     // Pokémon levels up with beauty ≥ specified value
+#define EVO_MEGA_EVOLUTION                0xffff // Not an actual evolution, used to temporarily mega evolve in battle.
+#define EVO_MOVE_MEGA_EVOLUTION           0xfffe // Mega Evolution that checks for a move instead of held item.
+#define EVO_PRIMAL_REVERSION              0xfffd // Not an actual evolution, used to undergo primal reversion in battle.
+#define EVO_FRIENDSHIP                    1      // Pokémon levels up with friendship ≥ 220
+#define EVO_FRIENDSHIP_DAY                2      // Pokémon levels up during the day with friendship ≥ 220
+#define EVO_FRIENDSHIP_NIGHT              3      // Pokémon levels up at night with friendship ≥ 220
+#define EVO_LEVEL                         4      // Pokémon reaches the specified level
+#define EVO_TRADE                         5      // Pokémon is traded
+#define EVO_TRADE_ITEM                    6      // Pokémon is traded while it's holding the specified item
+#define EVO_ITEM                          7      // specified item is used on Pokémon
+#define EVO_LEVEL_ATK_GT_DEF              8      // Pokémon reaches the specified level with attack > defense
+#define EVO_LEVEL_ATK_EQ_DEF              9      // Pokémon reaches the specified level with attack = defense
+#define EVO_LEVEL_ATK_LT_DEF              10     // Pokémon reaches the specified level with attack < defense
+#define EVO_LEVEL_SILCOON                 11     // Pokémon reaches the specified level with a Silcoon personality value
+#define EVO_LEVEL_CASCOON                 12     // Pokémon reaches the specified level with a Cascoon personality value
+#define EVO_LEVEL_NINJASK                 13     // Pokémon reaches the specified level (special value for Ninjask)
+#define EVO_LEVEL_SHEDINJA                14     // Pokémon reaches the specified level (special value for Shedinja)
+#define EVO_BEAUTY                        15     // Pokémon levels up with beauty ≥ specified value
+#define EVO_LEVEL_FEMALE                  16     // Pokémon reaches the specified level, is female
+#define EVO_LEVEL_MALE                    17     // Pokémon reaches the specified level, is male
+#define EVO_LEVEL_NIGHT                   18     // Pokémon reaches the specified level, is night
+#define EVO_LEVEL_DAY                     19     // Pokémon reaches the specified level, is day
+#define EVO_LEVEL_DUSK                    20     // Pokémon reaches the specified level, is dusk (5-6 P.M)
+#define EVO_ITEM_HOLD_DAY                 21     // Pokémon levels up, holds specified item at day
+#define EVO_ITEM_HOLD_NIGHT               22     // Pokémon levels up, holds specified item at night
+#define EVO_MOVE                          23     // Pokémon levels up, knows specified move
+#define EVO_MOVE_TYPE                     24     // Pokémon levels up, knows move with specified type
+#define EVO_MAPSEC                        25     // Pokémon levels up on specified mapsec
+#define EVO_ITEM_MALE                     26     // specified item is used on a male Pokémon
+#define EVO_ITEM_FEMALE                   27     // specified item is used on a female Pokémon
+#define EVO_LEVEL_RAIN                    28     // Pokémon reaches the specified level while it's raining
+#define EVO_SPECIFIC_MON_IN_PARTY         29     // Pokémon levels up with a specified Pokémon in party
+#define EVO_LEVEL_DARK_TYPE_MON_IN_PARTY  30     // Pokémon reaches the specified level with a Dark Type Pokémon in party
+#define EVO_TRADE_SPECIFIC_MON            31     // Pokémon is traded for a specified Pokémon
+#define EVO_SPECIFIC_MAP                  32     // Pokémon levels up on specified map

-#define EVOS_PER_MON 5
+#define EVOS_PER_MON 10

 // Evolution 'modes,' for GetEvolutionTargetSpecies
 #define EVO_MODE_NORMAL     0