ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
Evan
41d47a867e
format fixes
2021-03-03 10:48:57 -07:00
Evan
2ccdf1d89e
merge with be. magic guard checks
2021-03-03 09:21:06 -07:00
ghoulslash
0ee9425599
Update include/battle_scripts.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:07 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities
...
More Gen 8 Abilities
2021-03-01 10:40:09 -08:00
Evan
f4d4cf262e
fix screen cleaner, curious medicine, as one
2021-02-02 09:00:07 -07:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
Evan
4611c71bd1
merge with be
2021-01-21 08:55:14 -07:00
Evan
9902f6e603
merge with be
2021-01-13 14:32:14 -07:00
Evan
1e22ae4cf2
merge with be
2021-01-10 09:08:25 -07:00
Evan
c3615485f3
merge in berry branch
2021-01-06 12:54:02 -07:00
Evan
7646855e79
jaboca, rowap berry effects
2021-01-06 11:15:56 -07:00
Evan
efa4fe89ad
micle berry
2021-01-06 10:47:07 -07:00
Evan
f2e486eb0d
custap berry effect, custap/quick claw activation message
2021-01-06 09:37:31 -07:00
Evan
b3a6df8d57
stat raising berries
2021-01-05 22:13:32 -07:00
Evan
67fefd0261
var terrain, surge fixes
2020-12-13 19:42:48 -07: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
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
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
4ad5e368a9
fix merge conflicts
2020-12-01 17:57:57 -05: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
Eduardo Quezada D'Ottone
09a5d6c722
Implemented Wish Mega Evolution
2020-11-07 10:13:32 -03:00
DizzyEggg
0066640a1e
Merge with master
2020-07-27 14:51:39 +02: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
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
Eduardo Alvaro Quezada D'Ottone
c5a6acc7db
Corrosion ( #306 )
...
* Status move poisoning for Steel and Poison types.
* Can poison itself with Toxic Orb.
* Secondary effect poisoning now working.
* Created a function that checks if abilities can bypass type immunities.
* Created macro to handle typeimmunity
* Applied review changes.
* Applied review requests.
* Left more readable version of HOLD_EFFECT_TOXIC_ORB.
2020-04-21 15:59:19 +02:00
DizzyEggg
dd17360ab0
Zen Mode and Shields Down
2020-04-19 21:18:39 +02:00
DizzyEggg
ad481c8688
Moody
2020-04-19 15:44:44 +02:00
DizzyEggg
6a3944d27c
Frisk, would be easier if it didnt scan 2 opponents
2020-04-19 13:37:56 +02:00
DizzyEggg
e62f1475d4
Beast Boost and Receiver
2020-04-19 12:07:56 +02:00
DizzyEggg
e42ead10c9
Soul Heart
2020-04-18 19:59:09 +02:00
DizzyEggg
cbc0d8a57d
Healer
2020-04-18 19:09:17 +02:00
DizzyEggg
1395a7d382
Loafing Around bug fix
2020-04-18 13:04:28 +02:00
DizzyEggg
a2813e63de
Slow Start
2020-04-18 12:52:15 +02:00
Eduardo Alvaro Quezada D'Ottone
6078cd3e15
Anticipation ability ( #282 )
2020-04-11 12:24:25 +02:00
GriffinR
e633b57593
Document remaining status/general/special anims
2020-02-25 12:54:08 -06:00
Eduardo Alvaro Quezada D'Ottone
33e8e20118
Disguise ability ( #258 )
...
* Protection from attacks.
* Changes form when Busting Disguise.
* Ability changing moves set to fail.
- Simple Beam and Worry Seed now fail if the target has Disguise.
- Role Play and Skill Swap now fail if either the attacker or the target have Disguise.
* Disguise no longer triggers when transformed.
* Mimikyu reverts to Disguised
* No longer blocks from entry hazards and weather.
* Applied review changes
* Oops, new line
* yeah
2020-02-08 19:29:51 +01:00
DizzyEggg
39e3b0b740
Form changes layout and Stance Change Aegi
2019-12-31 19:11:53 +01:00
LOuroboros
c690d577a5
Implemented Aftermath's effect
2019-12-21 05:01:42 -03:00
Nephrite
0343f63eda
Dancer
...
Implemented Dancer and all relevant code for interacting with abilities, certain moves, etc
2019-12-07 10:19:01 +00:00
DizzyEggg
f979987c2f
Fix Intimidate and Trace on new switch in system
2019-08-30 12:25:21 +02:00
