GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush
...
fakematch fixes, begin documenting Berry Crush (based on #1187 )
2020-12-14 23:22:41 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names
...
refactor m4a.c/m4a_1.s constant/variable/type naming
2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix
...
Use BUGFIX for some inline fixes
2020-12-14 20:00:59 -05:00
Evan
b85dacce9d
fix conflicts
2020-12-14 08:50:41 -07:00
Evan
67fefd0261
var terrain, surge fixes
2020-12-13 19:42:48 -07:00
Evan
97172fc5b5
merge with be
2020-12-13 17:21:22 -07:00
Evan
ead8637e4f
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation
2020-12-13 17:09:04 -07:00
Evan
ac332d5e98
check bad move
2020-12-13 15:02:21 -07:00
GriffinR
f7a729df30
BUGFIX implies UBFIX
2020-12-13 16:16:48 -05:00
Tim Gates
581306db7b
docs: fix simple typo, redunant -> redundant
...
There is a small typo in include/constants/battle_frontier.h.
Should read `redundant` rather than `redunant`.
2020-12-13 22:14:50 +11:00
GriffinR
81d95b9325
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
Eduardo Quezada D'Ottone
47d96aed3c
Merge pull request #1285 from LOuroboros/spite
...
Updated Spite
2020-12-12 22:27:26 -03:00
Eduardo Quezada D'Ottone
db9933ce67
Merge pull request #1244 from ghoulslash/popup
...
toggleable manual ability popup destruction
2020-12-12 20:36:55 -03:00
LOuroboros
55bc2b4bb9
Corrected small inconsistency in move flag names
2020-12-12 12:18:56 -03:00
LOuroboros
31d483ef44
Some more battle_config.h tweaks
2020-12-12 11:35:05 -03:00
Michael Panzlaff
91ccf9e343
fix typo
2020-12-12 13:07:56 +01:00
LOuroboros
c5e04cf243
Removed the unnecessary Dragon Energy effect
...
The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up.
I took the chance and fixed its target too.
2020-12-12 01:35:54 -03:00
LOuroboros
33d7f22494
Improved the comment of B_STANCE_CHANGE_FAIL
2020-12-11 21:54:17 -03:00
LOuroboros
17a9555715
Oopsie.
2020-12-11 21:43:18 -03:00
LOuroboros
9ec2e44f4c
Updated Spite
2020-12-11 21:36:59 -03:00
LOuroboros
0ac026e6ca
Added the data of SwSh's Crown Tundra's moves
...
And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.
2020-12-11 20:49:23 -03:00
LOuroboros
c930a63c84
Implemented Punk Rock
2020-12-11 19:46:33 -03:00
LOuroboros
2b0702ec04
Implemented Perish Body
...
Inspired by Raguzero's implementation.
2020-12-11 19:44:32 -03:00
LOuroboros
7d8b8083e8
Implemented Sand Spit
2020-12-11 16:47:23 -03:00
Michael Panzlaff
f177c736fc
more CgbSound decipher work
2020-12-11 16:33:58 +01:00
Michael Panzlaff
15ff55eee5
use better m4a variable/constant names
2020-12-11 16:33:55 +01:00
Evan
28698a982d
try to faint script -> c
2020-12-11 08:05:00 -07:00
Evan
aad3a800c3
c functions for ai roamers/safari/first battle
2020-12-10 22:10:21 -07:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
LOuroboros
322918e280
Implemented Steam Engine
...
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
2020-12-10 18:27:35 -03:00
LOuroboros
791d561f14
Reworked the effects of the X Items
...
Thanks to Karathan's indications.
2020-12-08 18:24:42 -03:00
GriffinR
f95192ed87
Define terminal species IDs relatively
2020-12-08 00:45:05 -05:00
BuffelSaft
72b769ec75
Add config options for Jump Kick
...
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
2020-12-07 19:30:31 +13:00
Evan
426ea191ad
style fix
2020-12-05 21:04:12 -07:00
Evan
d5ad14c349
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup
2020-12-05 21:03:20 -07:00
Evan
21cab1b7a7
better negative totem boost system, totems occur before switch in abilities
2020-12-05 21:00:51 -07:00
LOuroboros
6a0fee9c56
Fixed Intrepid Sword and Dauntless Shield
...
And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
2020-12-05 14:03:13 -03:00
LOuroboros
002973d373
Renamed BattleScript_TargetAbilityStatRaiseOnSwitchIn
...
This battlescript is meant to be called within the case ABILITYEFFECT_ON_SWITCHIN of AbilityBattleEffects, which refers to the currently selected battler as Battler instead of Attacker or Target.
2020-12-05 13:50:47 -03:00
LOuroboros
e2f4ca27b0
BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn
2020-12-05 02:43:29 -03:00
LOuroboros
9e1d7cc827
Implemented Ball Fetch
2020-12-02 23:09:35 -03:00
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
dcefaf2563
anim particle changes false by default
2020-12-01 18:01:02 -05:00
Evan
4ad5e368a9
fix merge conflicts
2020-12-01 17:57:57 -05:00
Evan
1e68c46890
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation
2020-12-01 17:51:38 -05:00
Evan
5478179464
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims
2020-12-01 17:46:26 -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
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
7c6e74ab69
update terrain bg config option comment
2020-11-24 21:17:31 -05:00
Evan
6c0878b5fe
infestation between turn anim
2020-11-24 17:21:59 -05:00
