212 Commits

Author SHA1 Message Date
Raymond Dodge
c455665115
Add Struggle tests, weakness berry tests and prevent Struggle from activating Silk Scarf and Chilan Berry (#7880) 2025-10-08 16:03:20 +02:00
Eduardo Quezada
13f392987a
Fix some failed and assume fail tests with GEN_LATEST = GEN_5 (#7735) 2025-10-02 13:27:06 +02:00
hedara90
988a7f0420
Fix Big Root tests (#7817)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-09-29 14:30:08 +02:00
Alex
bd1a4db380
Fixes EndTurn Eject Pack (#7813) 2025-09-29 11:49:09 +02:00
Alex
e5e0800b90
Fixes Throat Spray being blocked by Sheer Force (#7808) 2025-09-27 15:59:31 -04:00
Alex
567a1290d4
Fixes Effects activating when move wasn't successful (#7803)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-27 19:55:12 +02:00
Alex
68e2bb5ab5
Fixes Leppa Berry timings (#7787)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-25 10:41:27 +02:00
Alex
83bfb34beb
Fixes Mycelium Might and Lagging Tail adjusting prio incorrectly (#7742)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-17 18:33:09 +02:00
Alex
499e90ac4b
Fixes Endure and Eject Pack issues (#7687)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-12 18:09:46 +02:00
Eduardo Quezada
1e6a533131
Fix most failed tests with GEN_LATEST = GEN_7 (#7688) 2025-09-03 19:23:23 +02:00
AlexOn1ine
ce52d83343 25/08/25 Master merge 2025-08-25 17:30:38 +02:00
Eduardo Quezada
8febd24604
Added missing Move Effect TODO tests - Volume F (#7605) 2025-08-23 22:25:19 +02:00
Eduardo Quezada
f009550137
Added Ability TODO tests - Volume C (#7562) 2025-08-22 20:24:26 +02:00
Eduardo Quezada
e974adcbeb
Wrote some tests (#7563) 2025-08-18 19:54:28 +02:00
Alex
65b316625f
Fixes Knock Off still activating when there is no Item (#7496) 2025-08-13 15:00:04 +02:00
PhallenTree
c6ee7feaa3
Fixes some Ability Shield interactions (#7532) 2025-08-12 15:45:02 +02:00
AlexOn1ine
bd919e3219 11/08/25 Master to upcoming merge 2025-08-11 08:31:12 +02:00
Alex
7de3663f38
Fixes Life Orb still activating if move was absorbed (#7521) 2025-08-10 16:58:36 +02:00
Alex
acc82e7d79
Convert Status4 to volatiles (#7411)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-08-05 19:28:33 +02:00
AlexOn1ine
bc73f4654b merge master 31/07/25 2025-08-01 12:18:11 +02:00
Alex
38964e4f0a
Fixes Wandering Spirit overwriting battlers (#7407) 2025-07-25 13:26:12 -04:00
AlexOn1ine
90eef35715 master merge 2025-07-19 17:01:18 +02:00
Alex
73a2e5104e
Bugfixes for Knock Off, Cover, Thief, Ceaseless Edge and Stone Axe (#7326) 2025-07-14 21:34:21 +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
AlexOn1ine
aa9ff53b81 master to upcoming merge 2025-07-02 10:05:31 +02:00
ghoulslash
0c4b0c582e
Add some tests (#7234) 2025-06-28 10:20:39 +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
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
AlexOn1ine
aabb632894 Master to upcoming merge, 20/06/25 2025-06-20 17:09:58 +02:00
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) (#7107) 2025-06-13 14:12:13 +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
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
c489d36fc6
Fixes Gen3 berry activation timing (#6993) 2025-05-27 23:36:00 +02:00
AlexOn1ine
b90fdd1b3c Master to upcoming merge 2025-05-26 10:41:11 +02:00
Eduardo Quezada
17e570407e
Remove trailing whitespace (#6968) 2025-05-23 22:33:12 +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
Alex
ce079cfcc8
Fixes Life Orb damage still happening after attacker was unable to attack (#6940) 2025-05-21 16:16:33 +02:00
AlexOn1ine
35dff24c9b Master to upcoming merge 2025-05-15 20:37:27 +02: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
Eduardo Quezada
3ef61e6451
Combined type-enhancing hold effects (#6846) 2025-05-14 13:45:08 +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
3b91a964c9
Fix Iron Ball type effectiveness check (#6794) 2025-05-09 22:23:44 +02:00
spindrift64
5e190d0782
Fix gems activating for moves that don't deal type damage (#6789) 2025-05-08 20:17:32 +02:00