Commit Graph

3966 Commits

Author SHA1 Message Date
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
ghoulslash
fac6f21ed0 AI_EFFECTIVENESS_xY are enums 2022-07-03 16:28:34 -04:00
ghoulslash
e4bf99d777 merge w be 2022-07-03 16:20:05 -04:00
ghoulslash
02a62e245b
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney
Config for lost money after losing a battle
2022-07-01 11:58:36 -04:00
ghoulslash
6cf0620f93
Merge pull request #2159 from Sneed69/trap-move-arrays
Trap move battle string related code cleanup
2022-07-01 11:07:28 -04:00
sneed
c1af418340 define B_MSG_WRAPPED_ constants 2022-07-01 17:52:46 +03:00
ghoulslash
a349462b78
Merge pull request #2134 from LOuroboros/bePretMerge
Pret merge for the battle_engine
2022-07-01 09:21:51 -04:00
ghoulslash
42f3cccdbe
Merge pull request #2154 from HamishSinclair/poltergeist
add poltergeist animation
2022-07-01 09:19:49 -04:00
ghoulslash
f4918222e8
Merge pull request #2156 from Sneed69/ai_3rd_type
Type effectivess related AI bugfixes
2022-07-01 09:09:12 -04:00
ghoulslash
80ac427443
Merge pull request #2160 from Sneed69/ignore-mystery-type-3
IS_BATTLER_OF_TYPE ignores third type if it's Mystery
2022-07-01 08:55:08 -04:00
ghoulslash
b33a8b0cb4 move ai score calc to STATE_TURN_START_RECORD so AI can consider move selection for item use 2022-06-05 11:09:04 -04:00
ghoulslash
c694e0cb90 merge w be 2022-06-05 08:22:24 -04:00
Sneed69
c60de5055d remove IsMoveWithoutAnimation 2022-06-03 17:42:42 +03:00
sneed
5934acbdc5 IS_BATTLER_OF_TYPE ignores 3rd type if mystery 2022-06-01 22:21:32 +03:00
sneed
86b436782a trap move related code cleanup 2022-06-01 22:01:50 +03:00
sneed
2e855b204a ai accounts for a third type 2022-05-29 04:55:37 +03:00
hamish
307d5d93c4 add potlergeist animation 2022-05-23 08:53:08 -04:00
LOuroboros
577791a6bc Moved order of defined header files in include/global.h 2022-05-13 10:52:09 -03:00
LOuroboros
2263caef7a Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine 2022-05-13 03:17:31 -03:00
sneed
bceccf5474 changes 2022-05-10 08:17:31 +03:00
sneed
709f583390 Initial commit 2022-05-10 02:58:24 +03:00
Eduardo Quezada D'Ottone
f80bab897f
Merge pull request #2112 from AgustinGDLV/evo_battle
Gen 8 Evolution Mechanics (Battle Engine)
2022-05-09 17:40:19 -04:00
AgustinGDLV
9bb5db2275 removed duplicate define 2022-05-08 21:23:51 -07:00
ghoulslash
07b0ce9737 add inner focus ability popup msg 2022-05-08 17:57:30 -04: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
c6b529ed50 add missing constant 2022-05-07 22:09:08 +03:00
AgustinGDLV
017f44f5ac
Apply suggestions from code review
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-05-07 09:35:00 -07:00
ghoulslash
9fa4d916d3
Merge pull request #2055 from AsparagusEduardo/BE_configs
Once again, Battle Configs
2022-05-07 11:31:25 -04:00
Eduardo Quezada D'Ottone
dc25bc6145 Merge branch 'battle_engine' into BE_WhiteOutMoney
# Conflicts:
#	include/constants/battle_string_ids.h
#	src/battle_message.c
2022-05-07 11:16:34 -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
096fe3c11d Removed unecessary B_LEEK_ALWAYS_CRIT config 2022-05-07 10:56:31 -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
e5b777695c
Merge pull request #2107 from Sneed69/steelbeam
Steel Beam Move Effect Implementation
2022-05-07 08:40:34 -04:00
sneed
ef7cd3cdfe BattleScript_DefiantActivates rename 2022-05-06 11:15:24 +03:00
AgustinGDLV
e730d64945 corrections 2022-05-05 15:54:33 -07:00
AgustinGDLV
6235970722 added special battle evo changes 2022-05-05 11:41:27 -07:00
sneed
865b771db7 initial commit 2022-05-05 00:57:19 +03:00
sneed
60d7d8f97e Initial Commit 2022-05-03 03:38:44 +03:00
sneed
b17d1f7816 Add generation specific interactions 2022-05-02 17:56:09 +03:00
BuffelSaft
746d9ea6c5 Add AI_GetBattlerMoveTargetType()
Add AI version of the function that handles move target selection, as it needs to have ability and item info that it may not have access to.
2022-04-27 22:23:20 +12: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
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer
Trainer hill clean up
2022-04-20 00:20:44 -04:00
LOuroboros
b6e2945072 Merge branch 'master' of https://github.com/pret/pokeemerald into bePret 2022-04-11 01:22:10 -03:00
GriffinR
328b925a08 Move trainer hill map data to bin files 2022-03-31 14:08:31 -04:00
GriffinR
62f3f144ab Clean up some trainer hill 2022-03-31 12:54:07 -04:00