1258 Commits

Author SHA1 Message Date
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) (#7107) 2025-06-13 14:12:13 +02:00
hedara90
75982721cd
Fixed changed effect for Sheer Cold (#7099)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-12 10:42:42 +02:00
Pawkkie
3db12a0ae6
Haze Boosting AI Followup (#6966) 2025-06-11 18:30:22 +02:00
Eduardo Quezada
393bed069a
Wrote some missing tests (#7094) 2025-06-11 09:13:37 +02:00
Hedara
bdd7c5bfa8 Merge branch 'master' into master-merge
Conflicts:
	src/contest_painting.c
2025-06-09 23:27:18 +02:00
Alex
fd856e5068
Removes duplicate AI ability func (#7045)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-06-09 11:30:16 +02:00
Emilia Daelman
f4ff5e6d26
Feature/ai/wide guard quick guard singles (#7086)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-08 21:50:34 +02:00
PhallenTree
28d185be95
Fixes Pursuit potentially causing both battlers to switch into the same mon (#7084) 2025-06-07 23:59:44 +02:00
i0brendan0
67f7ad6b1e
[DRAFT] Fix Normalize not boosting Normal type moves if they were already Normal type (#7060)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-06 22:00:33 +02:00
Linathan
dc279f14ba
Chloroblast fix (#7008) 2025-06-06 21:33:56 +02:00
Alex
f374291f69
Fixes Wandering Spirit copied ability activation on fainted mon (#7066) 2025-06-05 22:47:32 +02:00
PhallenTree
b3752e13d8
Fixes Aura Wheel + Normalize and Hunger Switch while Transformed/Terastallized (#7061) 2025-06-04 21:58:10 +02:00
Eduardo Quezada
d795de9e9d
Remove more instances of hard-coded Move IDs (#7056) 2025-06-03 23:26:48 +02:00
Bassoonian
1a6ed20713
Add dedicated getter functions for Pokémon types and abilities (#7043) 2025-06-03 22:05:22 +02:00
Alex
177fa2f096
Combines Super Fang and Guardian of Alola effects (#7048) 2025-06-03 10:26:25 +02:00
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums (#7041) 2025-06-02 15:54:37 +02:00
Alex
ede15918cf
Refactors Final Gambit + Tests (#7005) 2025-05-31 15:52:53 +02:00
jfb1337
096493aa35
AI: Add AI_SMART_TERA flag to make smarter decisions about when to terastalize. (#6705)
Co-authored-by: jfb1337 <>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-31 09:47:25 +02:00
PhallenTree
fa342b2909
Fixes Defiant/Competitive not resetting stat change animations and stat change related cleanup (#7004) 2025-05-31 08:45:46 +02:00
AlexOn1ine
f4c64a2d79 conflicts 2025-05-30 19:20:32 +02:00
Alex
5bdab5163e
Update Supersweet Syrup with eject pack fix (#7015) 2025-05-30 11:58:32 +02:00
Alex
213503dee9
Fixes spread move fire types not defrosting all targets (#6998) 2025-05-29 11:25:10 +02:00
Raymond Dodge
e605b87722
Fix out-of-bounds in Heal Bell Cures Entire Party test (#7011) 2025-05-29 10:59:47 +02:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
2025-05-28 14:26:15 +02:00
Alex
c489d36fc6
Fixes Gen3 berry activation timing (#6993) 2025-05-27 23:36:00 +02:00
ghoulslash
84118dec97
Fix heal bell test, add sparkly swirl test (#6262)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-26 19:45:51 +02:00
Pawkkie
99073dc9f2
Fix bad odds / defensive switchin double switch cases (#6927) 2025-05-26 16:59:25 +02:00
AlexOn1ine
b90fdd1b3c Master to upcoming merge 2025-05-26 10:41:11 +02:00
Bassoonian
812bde8a48
Pret merge (24th of May, 2025) (#6978) 2025-05-25 23:08:37 +02:00
Vex
7b686b6749
Fix Wish healing even if the target is Heal Blocked (#6979)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-05-25 23:01:11 +02:00
Pawkkie
f8b3a02f6c
Backport #6712 Fix party data assignment (#6980) 2025-05-25 10:06:49 +02:00
Alex
d0313ff323
Rename AI test (#6977) 2025-05-24 17:12:48 -04:00
Hedara
dc6e40a839 Fix tests using old item functions 2025-05-24 21:57:51 +02:00
Eduardo Quezada
17e570407e
Remove trailing whitespace (#6968) 2025-05-23 22:33:12 +02:00
Pawkkie
71f1c97d3e
Fix switch AI considering non-choiced SE moves when choiced (#6892) 2025-05-23 14:20:36 +02:00
Alex
87cbb457f1
Fixes AI not seeing primal weather and partner absorbing abilities (#6936) 2025-05-22 17:25:29 -04:00
Alex
f9400332fc
Fixes AI repeated use of weather set up moves (#6963) 2025-05-22 16:50:13 -04:00
Alex
48100e9593
Fixes Unnerve activation not limited to 1 per switch-in (#6960) 2025-05-22 19:15:01 +02:00
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