LOuroboros
0c4c6fc778
Implemented Cotton Down
2020-12-02 22:53:00 -03:00
LOuroboros
e11fa09632
Implemented Intrepid Sword and Dauntless Shield and...
...
-Renamed BattleScript_TargetAbilityStatRaise to BattleScript_TargetAbilityStatRaiseOnMoveEnd
-Added a copy, BattleScript_TargetAbilityStatRaiseOnSwitchin
Their labels reflect the instances of a battle in which they can be called.
2020-12-02 19:07:08 -03:00
Evan
2bfc7ea9b1
merge upstream
2020-12-01 15:42:04 -05:00
Evan
f54cd0b25d
fix z effect scripts
2020-12-01 15:35:39 -05:00
Evan
9755923cc3
light that burns the sky split, fix electric z move anims
2020-12-01 14:44:45 -05:00
Evan
ce19e33cc4
handle double and multi battles
2020-12-01 13:43:15 -05:00
Evan
fd8951d040
trainer z move ai
2020-12-01 08:24:33 -05:00
Evan
a0bde70493
z move effects
2020-11-30 10:55:46 -05:00
ExpoSeed
aa7facf57b
Merge pull request #1243 from ghoulslash/abilities
...
Finish Switch In Ability Activation Messages
2020-11-28 20:27:32 -06:00
Evan
f114534ae3
z move anim/effect, black hole eclipse anim
2020-11-28 13:09:43 -05:00
Eduardo Quezada D'Ottone
7aa999af59
Merge pull request #1235 from ultima-soul/ability_expansion
...
Expand Ability IDs to u16, Add SWSH Ability Data, and Remove Cacophony
2020-11-28 14:56:01 -03:00
Evan
2b1dfe73cf
z move unleash anim, fix active/used flags
2020-11-27 23:38:29 -05:00
Evan
348d70b309
z move indicator and some data
2020-11-26 15:56:18 -05:00
Evan
07a4400d50
finish switch in ability messages
2020-11-19 11:42:00 -07:00
ultima-soul
06e3097d44
Merge pull request #1234 from LOuroboros/guts
...
Implemented Guts' missing effect
2020-11-16 20:24:35 -08:00
Eduardo Quezada D'Ottone
27166a7147
Fixed UndoFormChange bug at the end of battles
2020-11-16 20:56:11 -03:00
LOuroboros
9c6a5f1ab6
Implemented Guts' missing effect
2020-11-16 20:22:59 -03:00
ultima-soul
e32659d4bb
Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities.
2020-11-16 13:50:26 -08:00
Eduardo Quezada D'Ottone
4da357aef4
Fixed compatibility with Pokémon Expansion
2020-11-15 13:35:02 -03:00
ghoulslash
686ff59b11
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves
...
LGPE & Isle of Armor move data.
2020-11-15 08:29:10 -07:00
Evan
66152538ec
add back accidentally deleted item theft battle type checks
2020-11-13 13:42:49 -07:00
Evan
a05d8f7d43
fix conflicts
2020-11-13 11:21:15 -07:00
Evan
435f928aa4
opponent trainer theft config option. Clean up code a bit
2020-11-13 11:00:44 -07:00
Eduardo Quezada D'Ottone
e87f0f1ddb
Review changes
2020-11-13 14:51:50 -03:00
ultima-soul
236d7145ae
Merge pull request #1220 from AsparagusEduardo/BE-SteelResistances
...
Added config option for Steel type resistances.
2020-11-12 23:25:21 -08:00
Evan
64bcac4589
move pickpocket to back of moveend sequence
2020-11-12 23:30:00 -07:00
ultima-soul
c3423b4212
Merge pull request #1206 from ExpoSeed/type-changing-moves
...
Refactor move effects for type changing moves
2020-11-12 19:10:48 -08:00
Evan
520f00f4ae
add pickpocket
2020-11-11 18:08:46 -07:00
Eduardo Quezada D'Ottone
4b9d0d8e24
Added config option for Steel type resistances.
2020-11-11 17:48:02 -03:00
Eduardo Quezada D'Ottone
e6f8d57f08
Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo
...
# Conflicts:
# include/constants/battle_string_ids.h
2020-11-10 17:28:17 -03:00
Eduardo Quezada D'Ottone
ddb6142709
Review changes 3.
2020-11-08 21:08:58 -03:00
Eduardo Quezada D'Ottone
35d5324324
Review changes.
2020-11-08 21:02:34 -03:00
ExpoSeed
7ea34968f9
Add damage calc for plates
2020-11-08 01:57:52 -06:00
ultima-soul
99fdc13e61
Merge branch 'master' into battle_engine_sync
2020-11-07 15:59:20 -08:00
Eduardo Quezada D'Ottone
09a5d6c722
Implemented Wish Mega Evolution
2020-11-07 10:13:32 -03:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466
re-match BattleIntroOpponent1SendsOutMonAnimation
...
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
2020-10-26 05:52:00 -04:00
Kurausukun
077a2c23dc
port HasNoMonsToSwitch fakematch fix (from #1181 )
2020-10-25 23:45:42 -04:00
Eduardo Quezada
d596fa7e12
Merge remote-tracking branch 'RHH/battle_engine' into PR-MoveSplitOption
...
# Conflicts:
# include/battle_util.h
# include/constants/battle_config.h
# src/battle_util.c
2020-10-23 21:49:59 -03:00
ultima-soul
84c134779a
Merge pull request #521 from AsparagusEduardo/BE-Identation
...
Fixed indentation for various files.
2020-10-23 08:46:17 -07:00
LOuroboros
00bc6ab96b
More review corrections
2020-10-21 16:39:06 -03:00
LOuroboros
682d29b088
Removed the static variable from the ShouldGetStatBadgeBoost function
2020-10-21 15:30:20 -03:00
LOuroboros
503134167a
Review corrections
2020-10-21 15:01:53 -03:00
LOuroboros
4794c63066
Reincorporated badge based stat boosts
2020-10-21 12:57:57 -03:00
Eduardo Quezada
1bc38feca5
Fixed indentation for various files.
2020-10-19 18:01:19 -03:00
Eduardo Quezada
a6e88b82ee
Review changes and option to hide split icon.
2020-10-15 20:15:44 -03:00
LOuroboros
1635585e68
Removed duplicate inclusion of battle_config.h
...
## Description
I think the title is self-explanatory, but the header file that is `include/constants/battle_config.h` is included twice unnecessarily.
## **Discord contact info**
Lunos#4026
As usual, if there's anything wrong please let me know.
2020-10-15 02:59:48 -03:00
Eduardo Quezada
0d39b29691
Option to use Gen 3 Physical/Special split.
2020-10-15 00:16:50 -03:00
ExpoSeed
d4e58d9746
Fix style, sync moved functions properly
2020-10-13 09:40:01 -05:00
ExpoSeed
9e2c8a95c1
Sync bev2 with pret
2020-10-11 01:01:47 -05:00
