1306 Commits

Author SHA1 Message Date
Hedara
90aed43c27 Merge branch 'master' into master-upcoming
Conflicts:
	.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
	.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
	.github/ISSUE_TEMPLATE/03_feature_requests.yaml
	.github/ISSUE_TEMPLATE/04_other_errors.yaml
	.github/pull_request_template.md
	src/battle_controller_player.c
	src/battle_main.c
	src/battle_script_commands.c
	src/battle_util.c
	src/data/graphics/pokemon.h
	src/data/pokemon/species_info/gen_9_families.h
	test/battle/ability/flower_veil.c
	test/battle/ability/sweet_veil.c
	test/battle/ability/synchronize.c
	test/battle/ability/water_bubble.c
	test/battle/move_effect/fell_stinger.c
	test/battle/move_effect/level_damage.c
	test/battle/move_effect/magic_room.c
	test/battle/move_effect/me_first.c
	test/battle/move_effect/sky_drop.c
	test/battle/move_effect/smack_down.c
	test/battle/move_effect/wish.c
	test/battle/move_flags/ignore_type_if_flying_and_ungrounded.c
2025-05-22 15:41:08 +02:00
PhallenTree
eb2121924d
Fixes Knock Off/Smack Down effect on immune target/protect (#6958) 2025-05-22 11:26:54 +02:00
Alex
8ad1f329c9
Fixes Dazzling abilities activating on all multi hit move hits (#6943) 2025-05-22 10:37:00 +02:00
Eduardo Quezada
be4b8ca3d0
Fix KNOWN_FAILING Bestow tests (#6947) 2025-05-22 10:23:15 +02:00
Alex
ce079cfcc8
Fixes Life Orb damage still happening after attacker was unable to attack (#6940) 2025-05-21 16:16:33 +02:00
Pawkkie
3f89abea74
Fix test not referencing AI_TRAINER_NAME (#6926) 2025-05-19 22:17:46 -07:00
Eduardo Quezada
406fd7ce81
Expand trainerproc to support additional battle types (#6770)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-17 15:08:44 +02:00
Eduardo Quezada
edf7c67775
Remove non-volatile status EFFECTs (#6772) 2025-05-16 22:52:51 +02:00
surskitty
e44d0326be
AI double battle friendly fire logic improvements (#6766) 2025-05-16 11:41:03 -04:00
Eduardo Quezada
6711df36a3
Create missing ability and move effect test files (#6845) 2025-05-16 12:20:44 +02:00
Eduardo Quezada
3a3c246509
Consolidated stat-priority ability tests (#6863) 2025-05-16 12:09:39 +02:00
innocenthedgehog
49584e134b
Switch AI considers Bulletproof ability (#6872) 2025-05-16 10:35:34 +02:00
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
kittenchilly
4474bd5b80
Add move description data for Z-Moves and Max/G-Max moves (#6852) 2025-05-15 10:44:09 +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
Pawkkie
3f5335c4ba
Refactor AI flags to u64 (#6753)
Co-authored-by: DizzyEggg
2025-05-04 17:16:34 +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