Commit Graph

8740 Commits

Author SHA1 Message Date
ghoulslash
c0e408bfab fix aqua ring heal anim 2021-12-05 14:44:22 -05:00
Eduardo Quezada D'Ottone
ae1d124a0c
Merge pull request #1969 from LOuroboros/patch-2
Removed ITEM_ENIGMA_BERRY_E_READER usage
2021-12-03 15:53:46 -03:00
LOuroboros
ac606364e9
Removed ITEM_ENIGMA_BERRY_E_READER usage 2021-12-03 15:44:12 -03:00
Eduardo Quezada D'Ottone
8058da5b88
Merge pull request #1963 from ghoulslash/be/aifix
Fix AI protect struct reset
2021-12-02 16:24:52 -03:00
ghoulslash
0434bf22e6
Merge pull request #1962 from LOuroboros/patch-2
One more merge conflict rejected
2021-12-02 13:20:14 -05:00
ghoulslash
fbf74a9988 fix protect struct reset 2021-12-01 15:30:07 -05:00
LOuroboros
e7bef25fb1
Updated hold_effects.h 2021-12-01 13:32:43 -03:00
Eduardo Quezada D'Ottone
14f974c9a9
Merge pull request #1954 from ghoulslash/be/aifix
revert ai item usage code
2021-11-30 14:06:25 -03:00
ghoulslash
d108f77aa4 revert ai item usage code 2021-11-28 13:12:56 -05:00
ghoulslash
3ac480076c
Merge pull request #1933 from BuffelSaft/brick-break
Fix Brick Break
2021-11-21 22:30:38 -05:00
BuffelSaft
8118f3bb44 Fix Brick Break
Should remove the target's screens, not the attacker's.
2021-11-22 16:17:10 +13:00
Eduardo Quezada D'Ottone
0f801b110b
Merge pull request #1696 from ghoulslash/battle_ai
AI Item Usage Considers Move Choice
2021-11-21 14:51:20 -03:00
Eduardo Quezada D'Ottone
dee7f97a8d
Merge branch 'battle_engine' into battle_ai 2021-11-21 14:46:09 -03:00
Eduardo Quezada D'Ottone
30a4ef3723
Merge pull request #1924 from ghoulslash/be/wish
Fix wish
2021-11-21 14:04:06 -03:00
ghoulslash
3404039330
Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn
Mega Evolution alters turn order
2021-11-21 08:12:21 -05:00
Eduardo Quezada D'Ottone
29172d6357
Merge pull request #1925 from ghoulslash/be/rampage
fix rampage cancelling
2021-11-21 00:15:53 -03:00
ghoulslash
3fb62f74c6 fix rampage cancelling 2021-11-20 18:35:56 -05:00
ghoulslash
37ab20e29c fix wish 2021-11-20 16:49:04 -05:00
kleeenexfeu
62b31aec55
syntax 2021-11-20 02:12:43 +01:00
kleeenexfeu
da20dae9c3
Only recalculate speed for battler choosing a move
Other actions have priority
2021-11-20 02:09:33 +01:00
kleeenexfeu
6402a7ab6e
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:42:20 +01:00
kleeenexfeu
c1743db19a
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:30:45 +01:00
kleeenexfeu
acddeeb1f9
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-11-19 23:30:33 +01:00
Eduardo Quezada D'Ottone
377c313771
Merge pull request #1919 from ghoulslash/be/unseenfist
Fix unseen fist check
2021-11-19 18:48:58 -03:00
ghoulslash
fb468b6776 fix unseen fist check 2021-11-19 16:32:00 -05:00
kleeenexfeu
fa4d71817b
Spaces instead of tab 2021-11-19 22:30:30 +01:00
kleeenexfeu
03a9f3f413 Mega Evolution alters turn order 2021-11-19 22:03:10 +01:00
Eduardo Quezada D'Ottone
1696e60b9f
Merge pull request #1876 from ghoulslash/be/ai_updates
Some more CanAIFaintTarget checks and other AI updates
2021-11-19 17:33:21 -03:00
Eduardo Quezada D'Ottone
ef3f573cc2
Merge pull request #1917 from BuffelSaft/unseen_fist
Implement Unseen Fist
2021-11-19 17:29:25 -03:00
BuffelSaft
c4f27174c3 Implement Unseen Fist
Unseen Fist allows contact moves to bypass protect effects, but doesn't lift the effect.
2021-11-19 16:21:33 +13:00
ghoulslash
b2411dbbc4
Merge pull request #1909 from AsparagusEduardo/BE_Leek
Updated Leek's effect with config
2021-11-16 08:50:31 -05:00
Eduardo Quezada D'Ottone
7dbc94deef Fixed undef 2021-11-15 23:36:52 -03:00
Eduardo Quezada D'Ottone
0af63c04eb Removed redundant uses of STATUS3_GASTRO_ACID check. 2021-11-15 23:29:54 -03:00
Eduardo Quezada D'Ottone
cc833ebb59 Created macro + config for always critting when using high-crit moves 2021-11-15 23:21:46 -03:00
Eduardo Quezada D'Ottone
a1bd6bd52f Updated species that benefit from Leek 2021-11-15 22:30:20 -03:00
Eduardo Quezada D'Ottone
bef896c65a
Merge pull request #1908 from kleeenexfeu/kleeenexfeu-PartyBattlerShouldAvoidHazardsfix
PartyBattlerShouldAvoidHazards fix
2021-11-15 19:54:46 -03:00
kleeenexfeu
ea34d4694d
PartyBattlerShouldAvoidHazards fix
AI was loading and modifying wrong data in the RAM
2021-11-15 16:48:44 +01:00
ghoulslash
2a1299715f merge w be 2021-11-15 10:45:59 -05:00
ghoulslash
9fdd6fffee AI_GetAbility supports hidden abilities 2021-11-15 10:45:23 -05:00
ghoulslash
0e397c43fe
Merge pull request #1898 from AsparagusEduardo/BE_postIETweaks
Adjusted elements to simplify the conflicts between BE and IE
2021-11-15 08:27:28 -05:00
Eduardo Quezada D'Ottone
2a5fed3c65
Merge pull request #1905 from BuffelSaft/aura
Fix Dark Aura and Fairy Aura
2021-11-15 08:40:11 -03:00
BuffelSaft
d4fa346540 Fix Dark Aura and Fairy Aura
Damage boost should be 33%, not 25%.
2021-11-15 21:40:20 +13:00
ghoulslash
8b296b97a8
Merge pull request #1887 from BuffelSaft/knock-off
Fix Knock Off, add config
2021-11-14 08:27:51 -05:00
Eduardo Quezada D'Ottone
5b63f53262
Merge pull request #1834 from ghoulslash/be/neutralizing_gas
Add Neutralizing Gas
2021-11-14 00:27:16 -03:00
Eduardo Quezada D'Ottone
80f531e03b
Merge pull request #1899 from BuffelSaft/softlock
Fix Cherrim softlock
2021-11-13 23:03:27 -03:00
BuffelSaft
cedc2e07bd Fix Cherrim softlock
Fix typo that caused infinite loop.
2021-11-14 13:31:06 +13:00
Eduardo Quezada D'Ottone
bcbdb353f5 Adjusted elements to simplify the conflicts between BE and IE 2021-11-13 12:10:20 -03:00
ghoulslash
940a165be7 merge w be 2021-11-13 09:09:15 -05:00
ghoulslash
23104a02e7
Merge pull request #1891 from AsparagusEduardo/BE_assaultVestText
Fix Assault Vest's battle message and effect on Me First
2021-11-13 09:06:12 -05:00
Eduardo Quezada D'Ottone
8f52996144
Merge pull request #1892 from ghoulslash/be/wish
wish update
2021-11-13 11:01:04 -03:00