ghoulslash
f4537b1213
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit
2021-10-30 09:14:32 -04:00
ghoulslash
4b0325dbe4
neutralizing gas switchout
2021-10-30 09:13:08 -04:00
Blackforest92
799852ea77
Introduce alternate Steel Beam
2021-10-30 17:00:55 +07:00
BuffelSaft
52054e4bfe
Fix Corrosion, Poison Touch
...
- CanBePoisoned now calls CanPoisonType instead of overriding it. Poison Touch now activates only if the attacker actually damaged the target. Partially implemented Pastel Veil.
2021-10-30 21:12:18 +13:00
BuffelSaft
47bfeaeecd
Implement Gorilla Tactics
...
It's Choice Band but as an ability.
2021-10-30 18:31:44 +13:00
ghoulslash
af914ee7ed
merge w be
2021-10-29 22:33:50 -04:00
ghoulslash
28bc7dc14d
start ability
2021-10-29 22:32:19 -04:00
BuffelSaft
6b65ef5bcf
Merge pull request #1824 from ghoulslash/itemheal_fix
...
Fix iteam healing after a failed move
2021-10-30 15:25:28 +13:00
ghoulslash
2502820e83
document a couple hitmarkers. fix failing moves not updating hp from own healing effects
2021-10-29 09:03:14 -04:00
ghoulslash
204748e01a
fix recycle and harvest
2021-10-28 17:52:52 -04:00
ghoulslash
f342e7c590
merge with be
2021-10-28 17:03:10 -04:00
LOuroboros
a77f058146
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into photonGeyser
2021-10-28 14:24:43 -03:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury
...
Implemented Hyperspace Fury
2021-10-28 13:20:33 -04:00
LOuroboros
82101d3581
Optimizations
2021-10-28 14:02:43 -03:00
LOuroboros
2803b840e5
Updated Shadow Force's move data
2021-10-28 13:52:35 -03:00
LOuroboros
28522f3ffb
Fixed Hyperspace Fury not breaking through protections
...
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
ghoulslash
bebaded415
merge with be
2021-10-27 16:48:38 -04:00
LOuroboros
8c35a68060
Quick syntax tweaks
2021-10-27 11:19:39 -03:00
LOuroboros
de157919b0
Added animations for Shell Side Arm
2021-10-27 11:14:17 -03:00
LOuroboros
ad95fa3d15
Updated Shell Side Arm's description
2021-10-27 11:14:12 -03:00
LOuroboros
fc7f1acf20
Merge branch 'Photon_Geyser' of https://github.com/MissingNoL/pokeemerald-expansion into photonGeyser
2021-10-27 11:13:59 -03:00
LOuroboros
1ab8c84f41
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury
2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
d4eaa73292
Added check in IsRunningFromBattleImpossible.
2021-10-26 20:45:59 -03:00
Eduardo Quezada D'Ottone
773c773bac
Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape
...
# Conflicts:
# include/constants/battle_config.h
2021-10-26 20:35:01 -03:00
BuffelSaft
4faa077641
Triple Kick, Super Fang tweaks
...
Ignore accuracy for Triple Kick and assume all hits will connect. Super Fang always does at least 1 damage, so this should be accounted for.
2021-10-26 13:41:08 +13:00
Eduardo Quezada D'Ottone
44625561e5
Taunt turn config
2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone
70aeaf288f
Rough Skin damage config
2021-10-24 20:07:22 -03:00
BuffelSaft
4310868bee
AI handles multi-strike and fixed dmg moves
...
Does not account for Parental Bond or Beat Up yet as those require some functions from #1676 .
2021-10-24 18:49:17 +13:00
BuffelSaft
bbe2eccf62
Fix typo
...
CanBeParayzed to CanBeParalyzed
2021-10-24 17:57:06 +13:00
BuffelSaft
d64dc2bbe8
Sleep moves don't check target's type
...
Dark types aren't immune to Hypnosis, Ghost types aren't immune to Yawn or Lovely Kiss, so this check isn't needed.
2021-10-24 17:55:37 +13:00
Eduardo Quezada D'Ottone
71ff664700
Ordered config into new categories
2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone
d95351dd97
Merge branch 'BattleEngine' into BE_config
...
# Conflicts:
# include/constants/battle_config.h
2021-10-23 19:46:33 -03:00
Eduardo Quezada D'Ottone
abb8a97d21
Merge pull request #1616 from LOuroboros/statCalcs
...
Added configs for modern post-battle stat calcs
2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone
0f95adf77a
Fixed AI check for Mean Look in case it's set to be GEN_5 or lower.
2021-10-23 11:56:56 -03:00
Eduardo Quezada D'Ottone
8bdcbb856d
Ghosts can now escape any wild battle
2021-10-23 11:41:31 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists
2021-10-23 11:06:34 -03:00
Eduardo Quezada D'Ottone
382ec13492
Merge pull request #1752 from ghoulslash/quick_draw
...
Quick Draw
2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone
d0253640fb
Merge pull request #1739 from LOuroboros/primalReversionBE
...
Implemented Primal Reversion
2021-10-22 22:27:45 -03:00
LOuroboros
cf027176a8
Made ENDTURN_RETALIATE use constants
2021-10-22 11:43:38 -03:00
LOuroboros
34fe0c54be
Fixed Retaliate timer's value decrease
...
I made an oopsie, basically.
Thanks to Xavion#9504 for the fix.
2021-10-21 09:11:12 -03:00
Eduardo Quezada D'Ottone
2bd8ded9d2
Merge pull request #1791 from ghoulslash/baton_pass
...
Update Baton Pass
2021-10-19 13:47:17 -03:00
ghoulslash
416c517e49
Merge pull request #1786 from Xavion3/damage_debug
...
Adds simulated damage to the debug menu
2021-10-19 12:14:38 -04:00
ghoulslash
fa8fa32259
Update src/battle_main.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-10-19 11:52:50 -04:00
ghoulslash
ebc86bb247
update baton pass status3 bits
2021-10-19 09:38:27 -04:00
LOuroboros
a6315ffc75
Implemented Plasma Fists
2021-10-19 09:50:18 -03:00
ghoulslash
eda99fcf29
Merge pull request #1742 from AsparagusEduardo/be_gStatuses4
...
Add gStatutes4
2021-10-19 08:45:47 -04:00
ghoulslash
305a12161c
Merge pull request #1771 from BuffelSaft/mulit_target
...
Fix multi target moves
2021-10-19 08:43:46 -04:00
Xavion3
6a16813ce8
Rename menu option to be more appropriate to changed info
2021-10-19 23:01:07 +11:00
Xavion3
4673ff30e4
Allow the AI to see damage against it's partner
2021-10-19 23:00:40 +11:00
Xavion3
055c1c47b7
Fix double battles damage scoring
2021-10-19 23:00:04 +11:00
