848 Commits

Author SHA1 Message Date
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
21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -07:00
BuffelSaft
ef41a4c14d Fix Jump Kick
* Now inflicts recoil damage on the user if the target was immune to the attack
* Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.
2020-12-06 16:14:02 +13: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
6bbd88049a Ball Fetch tweaks 2020-12-05 03:03:55 -03:00
LOuroboros
e2f4ca27b0 BattleScript_TargetAbilityStatRaiseOnSwitchin -> BattleScript_TargetAbilityStatRaiseOnSwitchIn 2020-12-05 02:43:29 -03:00
Evan
39cbc21925 fix trainer theft, update config option 2020-12-03 08:42:12 -05: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
4ad5e368a9 fix merge conflicts 2020-12-01 17:57:57 -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
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
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
Evan
4060b09bd6 expand top left move window. add z move init anim 2020-11-27 17:06:36 -05:00
ExpoSeed
914c830616 Remove Techno Blast and Judgment from battle scripts 2020-11-19 21:21:34 -06:00
Evan
07a4400d50 finish switch in ability messages 2020-11-19 11:42:00 -07:00
Evan
99d9a36860 add totem boosts 2020-11-19 10:35:37 -07:00
Evan
c026f705b3 permanent terrain move bgs 2020-11-17 19:45:27 -07:00
Evan
64bcac4589 move pickpocket to back of moveend sequence 2020-11-12 23:30:00 -07:00
Evan
e585be6f2e format fix 2020-11-11 18:37:11 -07:00
Evan
520f00f4ae add pickpocket 2020-11-11 18:08:46 -07:00
ExpoSeed
0912577ea1
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo
Implemented Wish Mega Evolution
2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone
98d3427e62
Prevent Ability Popup overwrites #1218 from ghoulslash 2020-11-10 17:34:33 -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
LOuroboros
bb4f00737e B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE 2020-11-10 14:26:47 -03:00
Evan
0683dc9c3f longer ability popup delay to prevent overwriting 2020-11-10 10:05:11 -07:00
LOuroboros
a25190f357 A few things.
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
2020-11-10 10:34:51 -03:00
LOuroboros
e179b9b5fe Updated Intimidate to Gen. 8 standard 2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone
09a5d6c722 Implemented Wish Mega Evolution 2020-11-07 10:13:32 -03:00
Eduardo Alvaro Quezada D'Ottone
1df696c1fb
Merge pull request #17 from LOuroboros/move_updates
Updated many moves' data to Gen. 8 standards
2020-10-15 20:56:58 -03:00
LOuroboros
fcc3c6c6ba Added a way to quickly switch Rapid Spin's move effect from Gen. 3 to 8 2020-10-15 04:21:40 -03:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
3014241179 Give songs meaningful english names 2020-08-20 19:06:14 -04:00
LOuroboros
1b9aa1f023 Updated many moves' data to Gen. 8 standards 2020-08-20 15:44:58 -03:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
GriffinR
a4e47f1201 Clean some battle_message.c data 2020-07-23 05:01:42 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg
759bde46bb Cheek Pouch 2020-07-16 15:20:03 +02:00
DizzyEggg
1a94d27fe6 Emergency Exit 2020-07-15 17:21:12 +02:00
DizzyEggg
c93ab64e46 UTurn Battle Arena no switchin 2020-07-08 17:38:28 +02:00
DizzyEggg
5a2d9fe9fe Fix Grassy Terrain bad loop 2020-06-29 18:26:53 +02:00
DizzyEggg
5ddb4634f5 berries work like in gen4 2020-06-29 18:04:13 +02:00
DizzyEggg
3bdf675221 Hopefully illusion works as intended now 2020-06-28 19:45:48 +02:00