ghoulslash
|
0c79d04dec
|
Merge pull request #1928 from AsparagusEduardo/BE_fixTransformForm
Prevent Transforming Pokémon from changing forms
|
2022-07-28 22:26:56 -04:00 |
|
Eduardo Quezada D'Ottone
|
aebd667260
|
Merge remote-tracking branch 'RHH/battle_engine' into BE_fixTransformForm
# Conflicts:
# src/battle_ai_main.c
|
2022-07-26 17:00:53 -04:00 |
|
Eduardo Quezada D'Ottone
|
bfb86fdc86
|
Config for Gen 3 faint switch mechanics
|
2022-07-24 14:57:47 -04:00 |
|
ghoulslash
|
3a77b52bad
|
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge
Battle Engine pret merge
|
2022-07-22 14:00:40 -04:00 |
|
Eduardo Quezada D'Ottone
|
af72fb0d32
|
Simplified pre-gen5 checks
|
2022-07-21 16:36:07 -04:00 |
|
Eduardo Quezada D'Ottone
|
56b9a50109
|
Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus
# Conflicts:
# include/constants/battle_config.h
|
2022-07-21 16:28:16 -04:00 |
|
ghoulslash
|
30a494f964
|
Merge pull request #2197 from AsparagusEduardo/BE_explosion
Config for Explosion halving defense
|
2022-07-21 16:11:32 -04:00 |
|
Eduardo Quezada D'Ottone
|
fe63dafcc1
|
Merge branch 'battle_engine' into BE_pretmerge
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
|
2022-07-20 08:50:30 -04:00 |
|
ghoulslash
|
2b5bb9f6e4
|
move gSwapDamagecategory to battle struct, use GetSplitBasedOnStats for photon geyser check
|
2022-07-19 18:24:53 -04:00 |
|
Eduardo Quezada D'Ottone
|
1cfb267b34
|
Config for Explosion halving defense
|
2022-07-18 13:10:27 -04:00 |
|
Eduardo Quezada D'Ottone
|
e55fea47f3
|
Added missing MOVE_UNAVAILABLE to Gorilla Tactics check
|
2022-07-18 09:24:08 -04:00 |
|
Eduardo Quezada D'Ottone
|
1dcbf59686
|
Config for Plus and Minus interaction
|
2022-07-18 08:11:02 -04:00 |
|
ghoulslash
|
f6b6ab56be
|
some style fixes
|
2022-07-17 19:16:13 -04:00 |
|
ghoulslash
|
6b84a9f0b3
|
merge w be
|
2022-07-17 12:40:43 -04:00 |
|
Eduardo Quezada D'Ottone
|
e791cf90ad
|
Merge tag 'pretmaster' into BE_pretmerge2
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
|
2022-07-15 12:58:46 -04:00 |
|
sphericalice
|
186f2c0232
|
Introduce a MOVE_UNAVAILABLE constant
|
2022-07-11 15:18:13 +01:00 |
|
ghoulslash
|
e4bf99d777
|
merge w be
|
2022-07-03 16:20:05 -04:00 |
|
ghoulslash
|
1ddf3ca7e0
|
Merge pull request #2169 from Sneed69/inverse-flying
Make ungrounded flying mons weak to ground in inverse battles
|
2022-07-01 11:57:43 -04:00 |
|
ghoulslash
|
14c531cf75
|
Merge pull request #2161 from Sneed69/confusion-fix
Fix confusion and disobedience self damage benefiting from STAB
|
2022-07-01 08:53:30 -04:00 |
|
sneed
|
407047ace7
|
ground x2 vs flying if inverse battle
|
2022-06-10 23:23:21 +03:00 |
|
sneed
|
1d19c0dc9f
|
Update battle_util.c
|
2022-06-05 16:38:37 +03:00 |
|
ghoulslash
|
c694e0cb90
|
merge w be
|
2022-06-05 08:22:24 -04:00 |
|
sneed
|
bf1025ac16
|
Update battle_util.c
|
2022-06-05 05:09:06 +03:00 |
|
sneed
|
e1c57e4071
|
move_none does not benefit from stab
|
2022-06-01 22:45:50 +03:00 |
|
BlackShark
|
75a44fdd79
|
use more true & false constants
|
2022-05-27 02:18:52 +02:00 |
|
Eduardo Quezada D'Ottone
|
13f9919b9e
|
Merge pull request #2123 from Sneed69/wikiberry_battle
Update Confuse Berry Hold Effect (Battle Engine)
|
2022-05-08 09:02:33 -04:00 |
|
Eduardo Quezada D'Ottone
|
989ec641f4
|
Merge pull request #2120 from ghoulslash/be/healblock
Heal Block AI and Pollen Puff Selection Prevention
|
2022-05-07 19:29:24 -04:00 |
|
sneed
|
f83875cf0f
|
remove item expansion check
|
2022-05-07 23:34:38 +03:00 |
|
sneed
|
4c8770fdc2
|
Update battle_util.c
|
2022-05-07 21:57:50 +03:00 |
|
ghoulslash
|
9fa4d916d3
|
Merge pull request #2055 from AsparagusEduardo/BE_configs
Once again, Battle Configs
|
2022-05-07 11:31:25 -04:00 |
|
ghoulslash
|
5456a87b83
|
fix pollen puff heal blocked battler in CanTargetBattler
|
2022-05-07 11:27:32 -04:00 |
|
Eduardo Quezada D'Ottone
|
cbe73de8c8
|
Merge pull request #1861 from LOuroboros/primalReversionTweaks
Primal Reversion Tweaks
|
2022-05-07 11:04:23 -04:00 |
|
Eduardo Quezada D'Ottone
|
4e7ce0b663
|
Merge branch 'battle_engine' into BE_configs
# Conflicts:
# include/constants/battle_config.h
|
2022-05-07 10:25:34 -04:00 |
|
ghoulslash
|
07579bd42b
|
prevent ally pollen puff selection under heal block. add some ai checks for heal block
|
2022-05-07 09:56:32 -04:00 |
|
ghoulslash
|
adfb336a3f
|
Merge pull request #2105 from Sneed69/healblock
Add missing Heal Block functionalities
|
2022-05-07 09:13:18 -04:00 |
|
ghoulslash
|
f63a451517
|
Merge pull request #2110 from Sneed69/gen8rattled
Gen 8 Intimidate triggers Rattled
|
2022-05-07 08:20:39 -04:00 |
|
sneed
|
ef7cd3cdfe
|
BattleScript_DefiantActivates rename
|
2022-05-06 11:15:24 +03:00 |
|
AgustinGDLV
|
74cc8c5ecb
|
fixed bolt beak switch-in boost
|
2022-05-05 22:37:28 -07:00 |
|
sneed
|
6c23eb431d
|
Heal Pulse and Pollen Puff
|
2022-05-05 13:56:59 +03:00 |
|
sneed
|
865b771db7
|
initial commit
|
2022-05-05 00:57:19 +03:00 |
|
sneed
|
b17d1f7816
|
Add generation specific interactions
|
2022-05-02 17:56:09 +03:00 |
|
sneed
|
be6148d876
|
Add missing Heal Block functionalities
|
2022-05-02 04:54:25 +03:00 |
|
BuffelSaft
|
af6242f2e0
|
Requested changes, Sticky Web edge case
Fix issues found by ghoulslash, and make sure Defiant works properly with Sticky Web and Court Change.
|
2022-04-27 21:51:10 +12:00 |
|
BuffelSaft
|
5358cc0a00
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
|
2022-04-25 13:38:13 +12:00 |
|
LOuroboros
|
a127cb32bb
|
Removed pointless use of preproc directives
|
2022-03-30 02:05:54 -03:00 |
|
LOuroboros
|
434f6cf5ad
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into flingBE
|
2022-03-26 08:43:55 -03:00 |
|
ExpoSeed
|
f50a406b18
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
|
2022-03-22 12:56:23 -05:00 |
|
LOuroboros
|
0a65fd316c
|
Fixed Enigma Berry check in CanMegaEvolve
|
2022-03-20 12:21:15 -03:00 |
|
ghoulslash
|
f53de6ae87
|
fix toxic/flame orb. use CanBeX'ed functions
|
2022-03-08 15:16:17 -05:00 |
|
ghoulslash
|
92487db470
|
add config check for B_GLARE_GHOST
|
2022-02-25 08:20:56 -05:00 |
|