Commit graph

8903 commits

Author SHA1 Message Date
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
Eduardo Quezada D'Ottone
8699db942b More ordering 2021-10-24 20:03:21 -03:00
GriffinR
7a89ad98c3 Document record mixing hall records 2021-10-24 16:13:07 -04:00
GriffinR
ab80264921
Merge pull request #1519 from GriffinRichards/doc-mgift
Document Mystery Gift
2021-10-24 15:50:39 -04:00
GriffinR
7f3c529935 Document record mixing mail swap 2021-10-24 15:49:19 -04: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
9a8b88bdb3 Updated config description 2021-10-23 11:59:57 -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
f4ff76c8ae MOVE_EFFECT_MEAN_LOOK now fails on ghost types. 2021-10-23 11:42:33 -03:00
Eduardo Quezada D'Ottone
8bdcbb856d Ghosts can now escape any wild battle 2021-10-23 11:41:31 -03:00
GriffinR
3834cc2957
Merge pull request #1524 from LOuroboros/patch-2
Added .sym files to .gitignore
2021-10-23 10:30:23 -04:00
LOuroboros
f182e9b9fd
Added .sym files to .gitignore 2021-10-23 11:17:23 -03:00
Eduardo Quezada D'Ottone
3b746de1d4
Merge pull request #1789 from LOuroboros/plasmaFists
Implemented Plasma Fists
2021-10-23 11:11:42 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists 2021-10-23 11:06:34 -03:00
GriffinR
65fb468151
Merge pull request #1523 from Jademalo/ide-support
Improve IDE Support
2021-10-23 09:43:14 -04:00
Jademalo
62436d9f67 IDE support formatting and consistency 2021-10-23 10:10:00 +01: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
4c90cbe625 Repositioned the gMoveResultFlags check 2021-10-22 19:58:27 -03:00
ghoulslash
09143c89e4
Merge pull request #1798 from LOuroboros/retaliateTimer
Fixed Retaliate timer's value decrease
2021-10-22 10:51:37 -04:00
LOuroboros
cf027176a8 Made ENDTURN_RETALIATE use constants 2021-10-22 11:43:38 -03:00
LOuroboros
24876ac5e3 Small tweak for BattleScript_EffectRapidSpin 2021-10-22 07:21:31 -03:00
LOuroboros
dd82e051bd Fixed Rapid Spin raising Speed even when the move fails 2021-10-22 07:21:10 -03:00
Jademalo
eb860a368e Improve IDE support 2021-10-22 04:30:33 +01:00
GriffinR
6067aa65b4 Fix shadw typo 2021-10-21 22:15:08 -04:00
GriffinR
303ce856ad Fix GET_CARD_BATTLE_LOST typo 2021-10-21 16:54:16 -04: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
GriffinR
0fbf5f59b3
Merge pull request #1522 from GriffinRichards/fix-sectorsperslot
Fix incorrect NUM_SECTORS_PER_SLOT define
2021-10-19 16:40:40 -04:00
GriffinR
bc409baeff Fix incorrect NUM_SECTORS_PER_SLOT define 2021-10-19 16:30:00 -04: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
GriffinR
934a7e7a5d
Merge pull request #1516 from GriffinRichards/doc-miscbattle
Miscellaneous battle documentation
2021-10-19 08:09:17 -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
Xavion3
150dd7c633 Add damage information to the debug menus 2021-10-19 22:39:07 +11:00
LOuroboros
da70accc3e Oopsie 2021-10-19 08:02:36 -03:00
LOuroboros
d9b8e11a9c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE 2021-10-19 07:47:42 -03:00
LOuroboros
2dea4f6782 Forgot to port over a return for jumpifcantreverttoprimal 2021-10-19 07:23:02 -03:00