Commit Graph

13252 Commits

Author SHA1 Message Date
Alex
0531ab5d87 Fix Ability PopUp freeze 2023-04-17 18:47:54 +02:00
CallmeEchoo
efd7465c12 fix gBattleMons using party indices instead of battle indices 2023-04-17 13:34:11 +02:00
Eduardo Quezada D'Ottone
037fd2ac0e
Fix Rare Candies (#2918) 2023-04-16 18:35:34 -04:00
Jaizu
73ba8264e0 Fix Rare Candies 2023-04-16 21:34:07 +02:00
CallmeEchoo
7d4807d956 fix nightmare status only being healed in doubles
this came up in a conversation on discord. its not tested.
2023-04-16 13:11:49 +02:00
AgustinGDLV
d3a090020b added code review 2023-04-15 15:30:07 -07:00
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
Eduardo Quezada
dacd0785db Fixed Mega Evolution script name 2023-04-14 15:17:19 -04: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
Martin Griffin
48fba7a35c
Fixed AI not considering Hidden Abilities in its team during switching logic (#2908) 2023-04-14 14:56:46 +01: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 D'Ottone
0397a1d8d6
pret merge 2023/04/13 (#2907) 2023-04-13 17:19:39 -04:00
Eduardo Quezada
7c29a24110 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413 2023-04-13 17:05:48 -04:00
Martin Griffin
513ebcb0dd
Improved PR Template (#2905) 2023-04-13 19:02:20 +01:00
Eduardo Quezada
eaddeabe16 Improve PR Template 2023-04-13 13:17:25 -04:00
AgustinGDLV
86242c1c70
MOVE_REVIVAL_BLESSING Effect (#2883)
* implemented Revival Blessing
2023-04-12 01:14:25 +01:00
Eduardo Quezada D'Ottone
e4656f3ab8
Add AI_FLAG_OMNISCIENT (#2872) 2023-04-10 13:25:40 -04: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
Eduardo Quezada D'Ottone
16b89e9991
Fix safari zone (#2898) 2023-04-10 09:07:27 -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
Eduardo Quezada D'Ottone
49f412ebb2
Add PLA Evo Items (#2897) 2023-04-10 07:16:30 -04: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
5d885b05d0
Fix trainers having empty movesets (#2890) 2023-04-09 21:17:23 -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
Eduardo Quezada D'Ottone
23c7707e75
Fixes Ominous Wind targeting (#2896) 2023-04-08 13:01:42 -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
psf
59dfc7c3ad
Update include/config/battle.h
Took suggestions from https://github.com/rh-hideout/pokeemerald-expansion/pull/2875#discussion_r1160574308

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2023-04-07 06:07:12 -07:00
ghoulslash
3a710a6614
Fixed switch-in abilities activating on terrain change (#2881) 2023-04-07 08:00:02 -04:00
Jaizu
f4ea663ab2
Revert "Fix overworld poison not working on newer generations config" (#2892) 2023-04-07 11:49:23 +02:00
Philipp AUER
d57d8e6e71 Revert "Fix overworld poison not working on newer generations config"
This reverts commit e1beb55a51.
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
Jaizu
a870883610
OW Poison configs (#2884) 2023-04-07 10:27:26 +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