1258 Commits

Author SHA1 Message Date
hedara90
4d4dea1b38
Master to upcoming merge (#6868) 2025-05-16 09:37:39 +02:00
Eduardo Quezada
3056909286
Added weather accuracy move flags (#6857) 2025-05-16 07:58:40 +02:00
AlexOn1ine
35dff24c9b Master to upcoming merge 2025-05-15 20:37:27 +02:00
Pawkkie
0ea1ebe8de
Fix AI_FLAG_PREDICT_MOVES scoring bug (#6867) 2025-05-15 13:53:51 -04:00
Alex
44d9b9c9e6
Further moveend changes (move blocks) (#6820) 2025-05-15 12:43:50 +02:00
Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect (#6806) 2025-05-15 10:45:48 +02:00
Jonathan Lin
b5fbced691
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834) 2025-05-15 09:40:02 +02:00
AlexOn1ine
56c9549bbe fix test 2025-05-14 23:45:31 +02:00
AlexOn1ine
1a773a5916 conflicts 2025-05-14 23:21:33 +02:00
Eduardo Quezada
3ef61e6451
Combined type-enhancing hold effects (#6846) 2025-05-14 13:45:08 +02:00
Eduardo Quezada
e64d260f52
Added Ability TODO tests B (#6836) 2025-05-13 10:34:06 +02:00
Alex
006abe097e
Add AI_FLAG_PREDICT_MOVES (#6551) 2025-05-12 23:10:10 +02:00
Alex
7f894ef5fb
Fixes a mistake made by me (#6828) 2025-05-12 20:08:00 +02:00
Hedara
1abfa7acfa Merge branch 'master' into master-upcoming
Conflicts:
	include/battle.h
	include/constants/battle_string_ids.h
	src/battle_ai_util.c
	src/battle_main.c
	src/battle_util.c
	test/battle/ai/ai.c
2025-05-12 18:21:35 +02:00
Alex
d00563d830
Changed White Herb hold effect name (#6815) 2025-05-11 11:34:47 +02:00
Alex
0ad3f929ab
Fixes Berserk Gene infinite loop (#6813) 2025-05-11 11:34:16 +02:00
spindrift64
f4f82f2394
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814) 2025-05-10 22:55:28 +02:00
Alex
8d5d7c7fca
Fixes ai moves being recorded without correct index (#6803)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-05-10 19:38:48 +02:00
spindrift64
3b91a964c9
Fix Iron Ball type effectiveness check (#6794) 2025-05-09 22:23:44 +02:00
AlexOn1ine
4959187d97 fix conflicts 2025-05-09 21:47:53 +02:00
PhallenTree
48c08c0368
Illusion struct cleanup and many Illusion fixes (#6798) 2025-05-09 20:41:20 +02:00
Pawkkie
c7ee329433 Full functionality 2025-05-08 16:45:10 -04:00
Pawkkie
da047dfd22
Add AI for Zero to Hero Palafin (#6791) 2025-05-08 20:33:27 +02:00
Pawkkie
83b7732fae Store predictingMove, config for chance 2025-05-08 14:19:43 -04:00
spindrift64
5e190d0782
Fix gems activating for moves that don't deal type damage (#6789) 2025-05-08 20:17:32 +02:00
Pawkkie
1e57670b34 Merge remote-tracking branch 'upstream/upcoming' into move-prediction 2025-05-08 13:58:18 -04:00
hedara90
b6b6e91959
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-07 16:50:12 +02:00
Alex
7c4fb512a1
Fixes Symbiosis not triggering when a weakness berry was consumed (#6782) 2025-05-07 11:04:11 +02:00
Alex
6fe5f6530a
General MoveEnd clean up and Fell Stinger adjustments (#6674) 2025-05-07 00:30:43 +02:00
Alex
4e7b1f2a97
Fixes Stomping Tantrum not boosting damage when missed due to Accuracy (#6762) 2025-05-06 12:07:01 +02:00
Pawkkie
c8fa4442d9
Adjust switch AI based on move scoring (#6615) 2025-05-06 00:39:44 +02:00
spindrift64
0742741dd3
Fix Life Orb inflicting self damage when using status moves (#6767) (#6773) 2025-05-04 22:26:12 +02:00
AlexOn1ine
40bf9ae087 conflicts 2025-05-03 10:26:07 +02:00
Alex
9259b7ee69
Bugfixes batch (#6750) 2025-05-02 20:14:27 +02:00
hedara90
ccda2308a3
Add AI_FLAG_PP_STALL_PREVENTION (#6743)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-02 11:30:09 -04:00
AlexOn1ine
057c0f5480 fix test compiling 2025-05-01 17:25:27 +02:00
AlexOn1ine
182d42642d Move out ai struct out of BattleResources 2025-05-01 11:27:48 +02:00
PhallenTree
fadf472157
Adds RNG tags and tests for Moody and Starf Berry (#6718) 2025-05-01 10:16:15 +02:00
Eduardo Quezada
d2a4b5ef84
Changed Tackle for Scratch in tests (#6730) 2025-04-30 17:18:52 -04:00
Alex
4ff2f3de42
Centralizes non volatile status effect checks (#6533)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-04-30 11:34:19 -04:00
Hedara
0eeba00d1b Merge branch 'master' into master-upcoming-2025-04-30
Conflicts:
	include/battle.h
	include/constants/expansion.h
	include/graphics.h
	src/battle_bg.c
	src/battle_util.c
	src/data/graphics/battle_terrain.h
	src/data/graphics/pokemon.h
	src/pokeblock_feed.c
	src/pokemon_sprite_visualizer.c
2025-04-30 15:22:37 +02:00
Alex
afcba8d9cd
Fixes Stomping Tantrum not doubling power if asleep or frozen (#6719) 2025-04-29 23:25:56 +02:00
Pawkkie
787a8a0d9d Merge remote-tracking branch 'upstream/upcoming' into move-prediction 2025-04-28 13:23:33 -04:00
Pawkkie
96a8035dec
Fix party data assignment (#6712) 2025-04-28 08:48:21 +02:00
Pawkkie
7a3cf5d3a3
Improve AI's defense against Focus Punch (#6713) 2025-04-28 08:34:09 +02:00
Pawkkie
4970b3bd95 Merge remote-tracking branch 'upstream/upcoming' into move-prediction 2025-04-28 00:33:42 -04:00
AlexOn1ine
e246b20e72 27/04/25 Master to upcoming merge 2025-04-27 09:50:25 +02:00
Alex
87bd59b6f4
Fixes Z and Max moves dmg reduction against side protection - upcoming (#6698) 2025-04-26 23:37:15 +02:00
Alex
1cd4d23969
Fixes Z and Max moves dmg reduction against side protection (#6697) 2025-04-26 21:46:41 +02:00
Bassoonian
d53c616e06
Adds a whole bunch of new tests (#6685) 2025-04-24 20:13:03 +02:00