Eduardo Quezada D'Ottone
bee36edd9c
Merge pull request #2173 from LOuroboros/yourAffection
...
Implement affection-now-friendship mechanics
2022-08-26 14:54:32 -04:00
Eduardo Quezada
eea718cfc6
Placeholder moves can't be used in battle.
2022-08-24 00:30:49 -04:00
Eduardo Quezada
56a2e91518
Updated move limitations
2022-08-23 22:40:04 -04:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
Eduardo Quezada
4b08a511c3
Cleanup from https://github.com/pret/pokefirered/pull/532
2022-08-07 22:40:15 -04:00
Eduardo Quezada
7b3401ee27
Standarized use of star in pointer types
2022-07-29 10:17:58 -04:00
LOuroboros
032b7b2ab9
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into yourAffection
2022-07-25 10:24:19 -03: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
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
LOuroboros
aa5c6a3f01
Implemented affection-now-friendship mechanics
2022-06-22 00:18:01 -03:00
ghoulslash
c694e0cb90
merge w be
2022-06-05 08:22:24 -04:00
GriffinR
5e6d8a77e4
Document some generic argument names
2022-05-31 14:34:25 -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
Eduardo Quezada D'Ottone
cbe73de8c8
Merge pull request #1861 from LOuroboros/primalReversionTweaks
...
Primal Reversion Tweaks
2022-05-07 11:04:23 -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
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
Eduardo Quezada D'Ottone
0dd2de988a
Merge branch 'battle_engine' into primalReversionTweaks
2022-02-12 23:08:12 -03: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
035b2332af
cache ai damage, effectiveness calcs
2022-01-13 11:28:27 -05:00
Eduardo Quezada D'Ottone
4ab4250d5d
Merge branch 'battle_engine' into be/sports
2021-12-19 20:42:15 -03:00
ExpoSeed
d6747527da
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
2021-12-16 21:44:01 -06:00
ultima-soul
7369f60c06
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
2021-12-03 17:30:45 -08:00
LOuroboros
19af517bbb
Edited pointless or useless Primal Reversion code
...
Also added an equivalent to GetMegaEvolutionSpecies and GetWishMegaEvolutionSpecies for Primal Reversion.
Also also modified how CanBattlerGetOrLoseItem checks for Primal Reversion.
Also also also rewrote the check that triggers Primal Reversion in TryDoEventsBeforeFirstTurn.
2021-12-01 00:56:33 -03:00
ghoulslash
5c52abd856
gen3 sport move functionality behind config
2021-11-23 21:20:32 -05:00
BuffelSaft
cca7ec8c58
Fix and rename GetMoveTargetType
...
Change name to GetBattlerMoveTargetType and make it actually use the battlerId argument.
2021-11-24 12:09:54 +13:00
BuffelSaft
fa0b5188bb
Dynamic move targeting
...
Properly implement Expanding Force by replacing all instances that read move target from gBattleMoves with a function.
2021-11-23 16:56:11 +13:00
ultima-soul
3ed51d6d91
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-11-21 10:40:26 -08:00
ghoulslash
940a165be7
merge w be
2021-11-13 09:09:15 -05:00
kleeenexfeu
f808710932
Moving IsBattlerProtected
2021-11-13 13:38:07 +01:00
ghoulslash
41bf1dc2f4
merge w be
2021-11-06 10:40:57 -04:00
ghoulslash
0ac6860855
Merge pull request #1810 from BuffelSaft/ai_improvements
...
AI: Multi-strike moves, variable power moves, sleep check
2021-11-04 12:28:00 -04:00
LOuroboros
22f7e81bef
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into mimicry
2021-11-04 12:25:26 -03:00
LOuroboros
b64d506809
Made a function to lift Mimicry's effect
2021-11-04 12:20:31 -03:00
BuffelSaft
7d10097684
Replace IsTwoStrikesMove with FLAG_TWO_STRIKES
...
Note that this flag does nothing until the Parental Bond PR is merged - it's just for the AI until then.
2021-11-04 17:11:56 +13:00
BuffelSaft
4a7ddb737b
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai_improvements
2021-11-04 15:51:11 +13:00
BuffelSaft
5a855db4ad
Fix prototype of CanBePoisoned
2021-11-04 11:08:37 +13:00
BuffelSaft
f323e2c047
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into pastel_veil
2021-11-03 14:18:28 +13:00
LOuroboros
69b42de0d9
Implemented Mimicry
...
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
2021-11-02 14:44:55 -03:00
ghoulslash
98b4b821dc
merge with be
2021-11-01 13:55:55 -04: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
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
ghoulslash
204748e01a
fix recycle and harvest
2021-10-28 17:52:52 -04:00
ghoulslash
bebaded415
merge with be
2021-10-27 16:48:38 -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
ghoulslash
5509ceea04
expand move target field
2021-10-16 16:10:45 -04:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite
2021-10-14 19:46:50 -03:00
ghoulslash
a3d2bdc9cf
merge with be
2021-10-13 18:30:53 -04:00
ghoulslash
06bcfea3b8
merge with be
2021-10-10 19:56:33 -04:00
