Commit Graph

38 Commits

Author SHA1 Message Date
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
Eduardo Quezada D'Ottone
ae8de0f07a Merge branch 'BattleEngine' into BE_TerrainMoves
# Conflicts:
#	data/battle_scripts_1.s
#	include/constants/battle_move_effects.h
#	src/battle_util.c
2021-11-06 10:44:05 -03:00
ghoulslash
1f176242aa add missing func definition 2021-10-15 16:06:50 -04:00
GriffinR
def6cc8158 Label battle script macro arguments 2021-10-13 17:44:04 -04:00
GriffinR
d8e65fc4b6 More battle doc, add battle window ids 2021-10-09 03:01:10 -04:00
Eduardo Quezada D'Ottone
5019615be1 Refactored Secret Power move effect into a function 2021-10-04 21:28:15 -03:00
sbird
0ee13418dc [ai] use expected value move dmg calculation 2021-09-22 13:15:43 +02:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
Evan
f4d4cf262e fix screen cleaner, curious medicine, as one 2021-02-02 09:00:07 -07:00
Evan
4c1e8f2f2e add curious medicine 2021-01-05 20:02:11 -07:00
Evan
ac332d5e98 check bad move 2020-12-13 15:02:21 -07:00
Evan
34dd11448b sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem 2020-12-09 10:28:18 -07: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
Eduardo Alvaro Quezada D'Ottone
8d848997c9
Battle Configs: The Revenge (#363)
* Turns for Uproar

* Chances for the amount of hits with multi-hit moves.

* Electric type mon's immunity to paralysis

* (Hi) Jump Kick to always do 1/2 of maxHP when crashing

* Turns for Disable.

* Minimized mons can always be hit by moves like Stomp

* Grass types immune to powder and spore moves.

* Psywave's damage formula

* Fixed random usage.
2020-05-28 10:38:27 +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
3dfd19b3e2 AI Weather moves tweaks 2020-04-20 13:00:04 +02:00
DizzyEggg
dd17360ab0 Zen Mode and Shields Down 2020-04-19 21:18:39 +02:00
DizzyEggg
093eca07b3 Volt Switch UTurn anim fix when cant switch out 2020-04-18 18:04:20 +02: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
ultima-soul
029ab67ff4 Implement Leaf Guard. 2019-12-16 00:29:20 -08:00
DizzyEggg
143cb7ad35 Updated switch mechanics 2019-08-22 15:57:33 +02:00
DizzyEggg
b12334c88b Remove cases from ABE, add functionality of Flower Veil 2019-03-31 21:38:58 +02:00
DizzyEggg
94cd547e9a Change move effect to u16 2019-02-14 13:17:27 +01:00
DizzyEggg
52d1e69591 Add AI support for newly added moves 2018-12-02 23:50:51 +01:00
DizzyEggg
198a1a8646 Proper Sound moves and substitute 2018-08-02 20:24:18 +02:00
DizzyEggg
6570324432 New crit calculator. 2018-07-23 21:36:05 +02:00
DizzyEggg
9c7db9f45e New AI damage and type functions 2018-07-15 12:39:07 +02:00
DizzyEggg
a9212eeb66 battle file more done and clean up tv 2018-02-27 18:13:28 +01:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
camthesaxman
6a4967689e more renaming 2018-02-06 13:48:02 -06:00
DizzyEggg
9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
DizzyEggg
5243285ab2 start working on battle 7 2017-11-02 18:19:49 +01:00
DizzyEggg
813b1bfd4a label and do more work at player controller 2017-10-22 01:04:02 +02:00
DizzyEggg
3d1c16523e start working on battle controllers, especially player 2017-10-21 17:32:35 +02:00
DizzyEggg
57e5624e06 battle9 is being worked on 2017-10-10 18:01:45 +02:00
DizzyEggg
3cc20c7c3f battle 2 is done 2017-10-06 17:06:45 +02:00