Commit Graph

9160 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
389a38b3cd Config for Facade being affected by burns 2022-02-12 23:55:54 -03:00
Eduardo Quezada D'Ottone
eebe664bfc
Merge pull request #2054 from LOuroboros/conversion
Updated Conversion's effect
2022-02-12 22:08:00 -03:00
LOuroboros
92d8268603
Update include/constants/battle_config.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-02-12 00:18:24 -03:00
LOuroboros
b52233ec31 Updated Conversion's effect 2022-02-11 21:42:39 -03:00
Eduardo Quezada D'Ottone
1454384b1b
Merge pull request #2052 from ghoulslash/be/ai_whostrikesfirst
Fix AI_WhoStrikesFirst
2022-02-11 17:56:53 -03:00
Eduardo Quezada D'Ottone
5c552cd070
Merge pull request #2043 from ghoulslash/be/psychoshift
Psycho Shift uses CanBeStatused Functions
2022-02-11 17:55:11 -03:00
ghoulslash
2782e816a4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into be/psychoshift 2022-02-09 14:31:46 -05:00
ghoulslash
209279c207 fix psycho shift string printing 2022-02-09 14:30:30 -05:00
ghoulslash
fcc85e8c17 fix AI_WhoStrikesFirst 2022-02-09 11:23:30 -05:00
Eduardo Quezada D'Ottone
69d62f1cb9
Merge pull request #2049 from ghoulslash/be/quickdraw
Fix ability pop up for quick draw
2022-02-03 21:07:34 -03:00
ghoulslash
36a824d8ab fix ability pop up for quick draw 2022-02-03 17:30:32 -05:00
Eduardo Quezada D'Ottone
5dc6f1caa4
Merge pull request #2047 from SubzeroEclipse/BE_decaps
Decapitalization of some battle strings
2022-02-01 14:57:52 -03:00
SubzeroEclipse
b946775e50 Fixed some new battle strings 2022-02-01 13:19:07 +01:00
ghoulslash
0046283c04
Merge pull request #2045 from LOuroboros/patch-2
Updated GetBallThrowableState
2022-01-29 11:55:04 -05:00
LOuroboros
ef3db02c22
Updated GetBallThrowableState 2022-01-29 12:30:40 -03:00
Eduardo Quezada D'Ottone
3b4f219180
Merge pull request #2044 from SubzeroEclipse/BE_MoveDescriptions
Fixed format of move descriptions' labels
2022-01-28 18:24:51 -03:00
SubzeroEclipse
5f33989c42 Fixed format of move descriptions' labels 2022-01-27 21:50:12 +01:00
ghoulslash
bc94a2bb16
Merge pull request #1979 from AsparagusEduardo/BE_wildNaturalEnemies
Wild mon natural enemies in double wild battles
2022-01-23 18:43:12 -05:00
ghoulslash
a165f9926d canbestatused for psycho shift 2022-01-23 13:46:30 -05:00
ghoulslash
3e1ddf6b93
Merge pull request #2042 from AsparagusEduardo/BE_unnerveChecks
Removed redundant checks for Unnerve
2022-01-23 13:22:52 -05:00
ghoulslash
8bca2f290d
Merge pull request #2041 from AsparagusEduardo/BE_getBattlerAbility
Optimized use of GetBattlerAbility
2022-01-23 13:16:01 -05:00
Eduardo Quezada D'Ottone
60f46a710c Removed redundant checks for Unnerve 2022-01-22 21:04:59 -03:00
Eduardo Quezada D'Ottone
b7df21b263 Optimized use of GetBattlerAbility 2022-01-22 20:25:51 -03:00
Eduardo Quezada D'Ottone
88d4b188cc
Merge pull request #1943 from kleeenexfeu/be_recalc_turn_order_after_actions
Turn order is recalculated after some actions
2022-01-22 19:07:34 -03:00
Eduardo Quezada D'Ottone
e880e4afdd
Merge branch 'battle_engine' into be_recalc_turn_order_after_actions 2022-01-22 19:01:45 -03:00
Eduardo Quezada D'Ottone
f42c4cd689
Merge pull request #1734 from ghoulslash/magician
Magician
2022-01-21 16:03:15 -03:00
ghoulslash
1710d3e2ed
Merge pull request #2038 from AsparagusEduardo/BE_PEFlag
Fixed Pokémon Expansion flag name in Battle Engine
2022-01-20 19:43:28 -05:00
Eduardo Quezada D'Ottone
925f65c450 Realigned config to previous state 2022-01-16 21:10:09 -03:00
Eduardo Quezada D'Ottone
ddfc3502f7 Fixed Pokémon Expansion flag name 2022-01-16 17:21:05 -03:00
Eduardo Quezada D'Ottone
8ce9b2241a
Merge pull request #2037 from ghoulslash/be/harvest
Fix harvest activation msg
2022-01-16 16:34:49 -03:00
Eduardo Quezada D'Ottone
d40119010e Merge branch 'BattleEngine' into BE_wildNaturalEnemies
# Conflicts:
#	include/constants/battle_config.h
2022-01-16 16:23:12 -03:00
ghoulslash
7182f290c1 fix harvest activation msg 2022-01-16 12:39:08 -05:00
ghoulslash
f3b9e6bb63
Merge pull request #1976 from kleeenexfeu/patch-2
[battle_engine]  Moxie interaction with spread move/follow me fix
2022-01-16 10:58:50 -05:00
Eduardo Quezada D'Ottone
6aabe58649
Merge branch 'battle_engine' into magician 2022-01-15 13:06:13 -03:00
ghoulslash
d7432ed684
Merge pull request #2011 from AsparagusEduardo/BE_Instruct
Refactored Instruct to use the regular forbidden move lookup table
2022-01-13 19:29:44 -05:00
Eduardo Quezada D'Ottone
80c1e11245 Merge branch 'BattleEngine' into BE_Instruct
# Conflicts:
#	src/battle_script_commands.c
2022-01-13 20:13:01 -03:00
ghoulslash
2b69b02724
Merge pull request #2017 from AsparagusEduardo/BE_forbiddenAssist
Extrapolated Assist forbidden flags to Gen 8 moves
2022-01-13 11:52:11 -05:00
ghoulslash
cbb4bca49a
Merge pull request #2028 from AsparagusEduardo/BE_AnchorShot
Fixed Anchor Shot description.
2022-01-13 11:43:39 -05:00
ghoulslash
46c2a9ada5
Merge pull request #2033 from LOuroboros/galarianZenMode
Allow Galarian Darmanitan's Zen Mode to work
2022-01-13 11:42:54 -05:00
ghoulslash
543252bc6c
Merge pull request #2034 from LOuroboros/proteanMsgboxFlush
Tweaked Protean's effect's InGame appearance
2022-01-13 11:42:31 -05:00
Eduardo Quezada D'Ottone
0441682af5
Merge pull request #2035 from LOuroboros/enigmaticGracidea
Removed the last bits of HOLD_EFFECT_GRACIDEA
2022-01-12 18:25:37 -03:00
LOuroboros
a4f0de5106 Removed the last bits of HOLD_EFFECT_GRACIDEA 2022-01-12 01:54:29 -03:00
LOuroboros
69f678b3fc Put the new B_WAIT_TIME_SHORTEST to use 2022-01-11 20:21:12 -03:00
LOuroboros
b2965e5522 Added a pause to BattleScript_ProteanActivates 2022-01-11 20:15:47 -03:00
LOuroboros
bee4019d22 Tweaked Protean's effect's InGame appearance 2022-01-11 19:52:51 -03:00
LOuroboros
24b5a5709a Allow Galarian Darmanitan's Zen Mode to work 2022-01-10 23:01:18 -03:00
Eduardo Quezada D'Ottone
3afda445ce
Merge pull request #2031 from LOuroboros/patch-2
Fixed usage of B_MULTI_BATTLE_WHITEOUT
2022-01-09 15:04:05 -03:00
LOuroboros
352523403a
Fixed usage of B_MULTI_BATTLE_WHITEOUT 2022-01-09 14:57:45 -03:00
Eduardo Quezada D'Ottone
f6b32c8d17 Fixed Anchor Shot description. 2022-01-08 20:19:53 -03:00
Eduardo Quezada D'Ottone
eba4c36189
Merge pull request #2024 from TheXaman/rhh_BE_B_SLEEP_TURNS
Yawn now uses B_SLEEP_TURNS
2022-01-07 21:56:06 -03:00