1406 Commits

Author SHA1 Message Date
Pawkkie
819e7d9c03 Fix failing test 2025-07-13 14:16:22 -04:00
Pawkkie
bc4ad07f47 Merge branch 'master' into master-to-upcoming 2025-07-13 13:34:35 -04:00
Pawkkie
06c54a2d60
Fix switching 1v1 calcs not handling 0 (#7131) 2025-07-13 17:45:59 +02:00
hedara90
14dbbf63d4
Remove competitive syntax config (#7154)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-07-12 13:03:36 -07:00
AlexOn1ine
68db4c5a77 12/07/25 master to upcoming merge 2025-07-12 11:55:06 +02:00
Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code (#7262)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-11 22:53:49 +02:00
Linathan
9228826ae1
New and polished battle animations (#7074) 2025-07-11 19:14:19 +02:00
Nephrite
7d5a949b71
Bag refactor 2 (#7166) 2025-07-11 11:50:38 +02:00
surskitty
424c127b8b
AI Tests + accompanying bugfixes for Skill Swap, Worry Seed, weather setting in double battles, and Discharging into an ally's lightningrod (#7297) 2025-07-10 16:08:14 -04:00
surskitty
4e558af76e
AI uses After You to help set up Trick Room. (#7310) 2025-07-10 20:03:46 +02:00
Pawkkie
419219bb31
Add AI_FLAG_ASSUME_STAB (#6797) 2025-07-10 19:58:31 +02:00
bassforte123
0f22cd26c8
Typo fixes in tests (#7312) 2025-07-10 10:06:40 +01:00
Pawkkie
e4d9298200
Fix move comparison scoring (#7301) 2025-07-10 09:51:46 +02:00
surskitty
95a02dddb9
Improved logic for Guard Split and Power Split. (#7298) 2025-07-09 18:11:39 -04:00
Pawkkie
d213b1fad7
Fix switch AI not seeing absorbing abilities (#7309) 2025-07-09 17:21:49 -04:00
Martin Griffin
f4cc802656
Fix crashing tests looping (#7299) 2025-07-09 09:02:55 +02:00
Alex
31a561201b
Adds hazard queue (#7295) 2025-07-07 15:30:35 -04:00
Alex
7ae97ab6e9
Refactor move Synchronise (#7271) 2025-07-07 13:36:21 -04:00
ghoulslash
4cb6afdec9
Ally Switch swap gLastX values (#7290)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-07-07 19:20:23 +02:00
ghoulslash
a24353d184
Add Overcoat Tests (#7287)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-06 15:11:04 +02:00
Alex
f808201945
Fixes Natural Gift moveend execution (#7274) 2025-07-05 15:05:35 -04:00
surskitty
4052ab337c
Expanding and Refactoring Skill Swap and other ability-changing moves (#7238)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-05 14:49:35 +02:00
PhallenTree
38a3963ec2
Fix Psych Up message and cleanup and don't allow switching to self in tests (#7277) 2025-07-05 14:47:36 +02:00
bassforte123
f74a23f44d
Typo fixes (#7280) 2025-07-04 11:04:29 +02:00
hedara90
ae1d99bb4f
Master to upcoming merge 01/07/25 (#7267) 2025-07-02 11:39:59 +02:00
AlexOn1ine
aa9ff53b81 master to upcoming merge 2025-07-02 10:05:31 +02:00
Alex
e503f97f32
Use dedicated functions for Mud/Water Sport (#7248) 2025-07-02 09:08:12 +02:00
Alex
10e55bd18d
Fixes Life Dew playing anim when it is not supposed to + tests (#7239) 2025-07-01 17:49:31 +02:00
Alex
f8fc86275c
Fixes protective pads not protecting from secondary protect effects (#7229) 2025-07-01 17:48:57 +02:00
Alex
89b1a45536
Fixes Ice Spinner and Steel Roller (#7259) 2025-07-01 15:39:22 +01:00
Alex
5451e40830
Fixes Toxic Thread animation not being played at the right time (#7247)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-06-30 21:41:29 +02:00
hedara90
ae123f0f37
Added tests for Toxic Thread (#7244)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-06-29 10:16:38 +02:00
ghoulslash
0c4b0c582e
Add some tests (#7234) 2025-06-28 10:20:39 +02:00
Alex
a96591dd43
Fixes Scald defrosting target while asleep (#7233) 2025-06-28 10:14:55 +02:00
ghoulslash
3dda407bb0
Jaboca berry triggers instead of being stolen by bug bite (#7237)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-06-28 08:43:50 +02:00
i0brendan0
206d2503d8
Add Gen 2 Moonlight, Morning Sun, Synthesis configuration (#7209)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-26 21:00:02 +02:00
PhallenTree
a82aa618fb
Adds Ability Shield activation message (#7224) 2025-06-26 14:42:32 +02:00
Alex
2531613a52
Fixes Eject Pack not resolving correctly during switch in effects (#7002) 2025-06-25 21:15:40 +02:00
Alex
7d7ffd58ae
Fixes Booster Energy timing activation + Clean up (#7175)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-06-25 18:20:55 +02:00
Alex
f8551830c9
Adds Gen5+ Encore config (#7051) 2025-06-25 15:58:30 +02:00
Hedara
51a5577f65 Merge branch 'master' into master-upcoming
Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c
2025-06-25 14:17:07 +02:00
Eduardo Quezada
8d81f60313
Fix tests failing with B_FRIENDSHIP_BOOST being TRUE (#7194)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-06-25 14:01:31 +02:00
Bassoonian
625918daf6
Add assumes for bag tests (#7188) 2025-06-23 13:11:59 +02:00
Bassoonian
c34ec8956d
Master to upcoming merge, 20/06/25 (#7169) 2025-06-23 10:04:44 +02:00
Eduardo Quezada
1f8455c769
Fixed TM and Berries disappearing when sorting (#7168) 2025-06-22 20:39:13 +02:00
Eduardo Quezada
bca28b40bb
Use argument.type for EFFECT_SOAK (#7141) 2025-06-21 00:04:52 +02:00
PhallenTree
98670ca30e
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170) 2025-06-21 00:04:01 +02:00
AlexOn1ine
3a42cd84af comment test 2025-06-20 17:31:16 +02:00
AlexOn1ine
aabb632894 Master to upcoming merge, 20/06/25 2025-06-20 17:09:58 +02:00
PhallenTree
340d815c6d
Stat Change (Animation) Refactor (#7144) 2025-06-18 14:24:35 +02:00