13536 Commits

Author SHA1 Message Date
Martin Griffin
aefe582596 GetSideParty/GetBattlerParty
Inline GetBattlerPartyData into its callers because its name is
confusing and we couldn't think of a better one.

This seems to fix a bug in one place where GetBattlerPartyData was being
used as if it had GetBattlerParty semantics.
2023-04-15 23:04:13 +01:00
AgustinGDLV
82dc1e3e93 fixed dupe strings in battle item use 2023-04-15 09:27:28 -07:00
LOuroboros
7d499548e8 Updates
-Added EFFECT_JUNGLE_HEALING to IsHealingMoveEffect
-Modified the code for EFFECT_TAKE_HEART inside AI_CheckViability and AI_CheckBadMove
2023-04-15 11:15:44 -03:00
AgustinGDLV
2eabcea86e
Battle Item Refactor (#2902)
* items that can be used in battle now use battlescripts
* removed ExecuteTableBasedItemEffect_
* taught AI how to use items, removed AI_itemtype/flag
* X-Items store stages raised in holdEffectParam
* USE_ITEM in tests
2023-04-14 19:25:50 +01:00
Eduardo Quezada
11beec62ee Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange
# Conflicts:
#	src/data/pokemon/evolution.h
#	src/field_poison.c
2023-04-14 11:31:02 -04:00
Eduardo Quezada
958bc34cdf Fixed AI not considering Hidden Abilities in its team during switching logic 2023-04-14 09:42:48 -04:00
Eduardo Quezada
7c29a24110 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413 2023-04-13 17:05:48 -04:00
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect (#2883)
* implemented Revival Blessing
2023-04-12 01:14:25 +01:00
ghoulslash
e3ca217d64 rename IsBattlerAIControlled 2023-04-10 11:36:17 -04:00
ghoulslash
5f4bfd9bb4 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/aiflag 2023-04-10 09:48:49 -04:00
ghoulslash
e49bb21ee4 some IsBattlerAIControlled replacements w BattlerHasAi 2023-04-10 09:48:44 -04:00
Jaizu
5c0e5d2133 Don't toggle mega indicator visibility on the Safari Zone 2023-04-10 14:40:56 +02:00
Jaizu
0f958806ea Remove unused battle funcs 2023-04-10 14:39:14 +02:00
aaghaht
bd54c70020 Add PLA evo items 2023-04-10 10:47:31 +05:30
Eduardo Quezada D'Ottone
5c1efe9419
RandomElement for structured RNG (#2868) 2023-04-09 21:20:04 -04:00
Eduardo Quezada D'Ottone
6fa3332879
Merge branch 'upcoming' into trainer_moves_fix 2023-04-09 21:08:43 -04:00
GriffinR
73a6a583b3
Merge pull request #1879 from GriffinRichards/cable-car-tilemap
Use tilemap file for cable car pylons
2023-04-09 13:19:43 -04:00
Jaizu
1df10886b0
fix an oversight that caused battles to continuesly be double battles (#2894) 2023-04-09 18:23:52 +02:00
Eduardo Quezada D'Ottone
1094861667
Modify "FillPartnerParty" to work with "Everything Customized" (#2889) 2023-04-08 13:02:47 -04:00
Bassoonian
02af4d0943 Fixes Ominous Wind targeting 2023-04-08 18:53:04 +02:00
GriffinR
d4e243136f
Merge pull request #1878 from GriffinRichards/num-text-printers
Replace NUM_TEXT_PRINTERS with WINDOWS_MAX
2023-04-08 08:41:04 -04:00
sbird
903b56756d fix an oversight that caused battles to continuesly be double battles 2023-04-08 02:23:43 +02:00
ghoulslash
ff2afb0eec
Fixed Comatose AI checks (#2866) 2023-04-07 09:27:28 -04:00
ghoulslash
c3e9f4b571
Added B_DOUBLE_WILD_REQUIRE_2_MONS to use of B_DOUBLE_WILD_CHANCE even when there is only one Pokémon in the party (#2878) 2023-04-07 09:26:22 -04:00
Philipp AUER
d57d8e6e71 Revert "Fix overworld poison not working on newer generations config"
This reverts commit e1beb55a51406ab9f9932b82dbc5b668b3aa9287.
2023-04-07 11:35:30 +02:00
Jaizu
e1beb55a51 Fix overworld poison not working on newer generations config 2023-04-07 11:21:47 +02:00
Jaizu
4709d2b46f Fix trainers having empty movesets 2023-04-07 10:53:44 +02:00
Alex
bd4736cc97 initial commit
test multi battle

final

remove empty line
2023-04-06 20:56:44 +02:00
Bassoonian
50b5dba655 Fix string issue as requested by Jaizu 2023-04-06 10:13:32 +02:00
Bassoonian
dfee8a4759 OW Poison configs 2023-04-06 00:26:52 +02:00
Eduardo Quezada D'Ottone
5fe79d83c1
Fix CalcMoveBasePower using battler addresses (#2858) 2023-04-03 23:27:36 -04:00
AgustinGDLV
131e455d0b Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-04-03 18:59:50 -07:00
GriffinR
57396026b2 Replace NUM_TEXT_PRINTERS with WINDOWS_MAX 2023-03-31 14:57:51 -04:00
GriffinR
4b859ff1e4 Use tilemap file for cable car pylons 2023-03-31 00:44:22 -04:00
PSF
24df9823e8 In response to PR discussion, added new preproc config for developers to toggle Overworld_ResetBattleFlagsAndVars 2023-03-30 06:35:38 -07:00
pkmnsnfrn
6a7466c929 Added B_DOUBLE_WILD_REQUIRE_2_MONS to allow use of B_DOUBLE_WILD_CHANCE even when there is only one Pokémon in the party 2023-03-29 11:11:07 -07:00
Alex
8c4396ddaf Gen9 move tests batch2 2023-03-29 13:01:20 +02:00
LOuroboros
977a55bdee Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2 2023-03-29 07:40:16 -03:00
PSF
686d42709a Added documentation on resetting battle flags and vars
Added Overworld_ResetBattleFlagsAndVars to Overworld_ResetStateAfterWhiteOut
2023-03-28 15:50:58 -07:00
ghoulslash
f8bbcdfe73 minor fix to mirror herb message 2023-03-28 15:12:54 -04:00
ghoulslash
afc4b4cdee add mirror herb 2023-03-28 15:07:37 -04:00
ghoulslash
10ef3e8348 style fixes 2023-03-28 10:58:44 -04:00
ghoulslash
00d695ac2b add AI_FLAG_OMNISCIENT 2023-03-28 10:38:48 -04:00
LOuroboros
ed9e860400 Post cherrypick corrections and improvements
-Made BattleScript_EffectTakeHeart use modifybattlerstatstage
-Optimized usage of BattleScript_EffectInfernalParade
-Tweaked the way in which Triple Arrows' increased crit. hit chance is handled
-Optimized syntax for case MOVE_EFFECT_TRIPLE_ARROWS in SetMoveEffect
-Optimized case EFFECT_INFERNAL_PARADE in CalcMoveBasePower
 -Infernal Parade is not known to interact with Comatose, so Eduardo and I will extrapolate that here
-Added AI conditionals for some of the effects
-Made Triage notice Jungle Healing and moves that use its effect
2023-03-28 10:08:52 -03:00
ghoulslash
dd99cb6da8
Fixed instances of gSideTimers not using side constants (#2867) 2023-03-27 21:48:50 -04:00
AgustinGDLV
504ec36b2b Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-03-27 16:22:11 -07:00
Eduardo Quezada D'Ottone
fa245c6edf
fix GetBattleAnimMoveTargets for non-player gBattleAnimAttacker (#2848) 2023-03-27 18:11:22 -03:00
AgustinGDLV
b856cb3e62 fixed Eiscue + multiple weather form changes at once (probably) 2023-03-27 12:05:06 -07:00
AgustinGDLV
2017bee3f8 fixed Castform + Cherrim 2023-03-27 11:35:23 -07:00
Martin Griffin
7b306b6147 RandomElement for structured RNG
Converts Tri Attack and Dire Claw to use structured RNG.
2023-03-27 18:50:18 +01:00