BuffelSaft
|
0a27b575dc
|
Fix merge error in battle scripts
|
2022-01-27 17:24:11 +13:00 |
|
BuffelSaft
|
9d1800f53e
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
|
2022-01-27 17:18:51 +13: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
|
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 |
|
Eduardo Quezada D'Ottone
|
97baedbd5e
|
Merge pull request #1923 from WiserVisor/battle_engine
Added Sky Drop to Battle Engine
|
2022-01-07 18:14:40 -03:00 |
|
TheXaman
|
328b501394
|
Update src/battle_util.c
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2022-01-05 18:54:42 +01:00 |
|
TheXaman
|
9733f92c7f
|
Yawn now uses B_SLEEP_TURNS, resolves #1873
|
2022-01-05 18:48:01 +01:00 |
|
W1serV1ser
|
178c4c66ba
|
Fixed gSideTimers typo
|
2022-01-04 12:38:50 -08:00 |
|
W1serV1ser
|
66faa6aa15
|
Follow Me/Rage Powder effect on target goes away once affected by Sky Drop
|
2022-01-04 12:33:31 -08:00 |
|
Eduardo Quezada D'Ottone
|
d433d67558
|
Extrapolated Assist forbidden flags to Gen 8 moves
|
2022-01-01 20:21:29 -03:00 |
|
Eduardo Quezada D'Ottone
|
221e38ff86
|
Merge pull request #1957 from ghoulslash/be/ability_popup
Ability Popup Fixes + Longer Ability Names config
|
2022-01-01 19:39:55 -03:00 |
|
Eduardo Quezada D'Ottone
|
6fcbc4c074
|
Merge pull request #2012 from LOuroboros/patch-2
Update battle_ai_util.c
|
2021-12-30 07:32:30 -03:00 |
|
LOuroboros
|
34c6e6ca31
|
Update battle_ai_util.c
|
2021-12-30 01:48:56 -03:00 |
|
Eduardo Quezada D'Ottone
|
5b54986e6b
|
Merge pull request #1980 from LOuroboros/multiBattles
Multi battle updates
|
2021-12-29 22:09:06 -03:00 |
|
Eduardo Quezada D'Ottone
|
ba43280a7c
|
Refactored Instruct to use the regular forbidden move lookup table
|
2021-12-29 21:04:15 -03:00 |
|
Eduardo Quezada D'Ottone
|
16398d4dc6
|
Merge pull request #2009 from LOuroboros/patch-2
Update pokemon.h
|
2021-12-28 22:49:10 -03:00 |
|
LOuroboros
|
ce7815ebcc
|
Update pokemon.h
|
2021-12-28 15:11:52 -03:00 |
|
LOuroboros
|
cc1a243145
|
Update src/battle_script_commands.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2021-12-28 12:18:44 -03:00 |
|
W1serV1ser
|
e0f7e7a2d9
|
Updated variable name in MOVEEND_SKY_DROP_CONFUSE
|
2021-12-27 12:10:38 -08:00 |
|
Eduardo Quezada D'Ottone
|
4d6f54e8d6
|
Merge pull request #2007 from ghoulslash/be/roleplay
Update Role Play
|
2021-12-25 11:37:57 -03:00 |
|