Commit Graph

77 Commits

Author SHA1 Message Date
GGbond
474d586452
Add tests for Taunt (#9386) 2026-03-02 12:30:52 +00:00
Hedara
beb9825fef Merge branch 'upcoming' into expansion-release 2026-02-28 22:00:41 +01:00
GGbond
cbe9f80e03 Fix 2026-02-27 18:08:19 +08:00
PhallenTree
8e3183a7a9
Simplify defrosting/thawing and expand target thawing config (#9271) 2026-02-23 17:11:05 +01:00
AlexOn1ine
675de8cbea 21/02/26 Master to upcoming merge 2026-02-21 12:55:21 +01:00
GGbond
acfd2f4f8c
Fix Taunt to not block Me First in Gen 5+ (#9069) 2026-02-10 12:05:41 +01:00
GGbond
57c51c0702
Fix Transform fail conditions with gen-specific checks (#9070) 2026-02-10 11:59:09 +01:00
Alex
63fc5bf0fe
Strength Sap fixes (#9130) 2026-02-06 15:11:23 +01:00
Eduardo Quezada
32d1777b7a
Use direct config names instead of enum names (#8824) 2026-02-06 11:57:33 +01:00
Hedara
0c447063e1 Merge branch 'master' into master-merge
Conflicts:
	data/battle_anim_scripts.s
	include/battle_util.h
	include/constants/expansion.h
	src/battle_anim_dark.c
	src/battle_anim_effects_1.c
	src/battle_anim_normal.c
	src/battle_hold_effects.c
	src/battle_script_commands.c
	src/battle_util.c
	src/debug.c
2026-02-04 12:46:59 +01:00
PhallenTree
022f5eb52e
Fixes Infiltrator and adds config for Substitute interaction (#9073) 2026-01-30 14:14:35 +01:00
AlexOn1ine
396c64c22a 30/01/26 Master to upcoming merge 2026-01-30 12:49:21 +01:00
GGbond
aafc581460
Fix Psych Up wrong battler message and Gen 6+ crit ratio copying (#9015) 2026-01-27 15:44:42 +01:00
AlexOn1ine
f8266b828b 26/01/26 Master to upcoming merge 2026-01-26 19:35:43 +01:00
GGbond
21492e0f23
Fix Foresight/Miracle Eye repeated-use behavior (#9025) 2026-01-26 14:48:39 +01:00
GGbond
128beb39e1
Fixed several issues with Parting Shot (#8928) 2026-01-20 22:06:50 +01:00
FosterProgramming
550fe9a7de
Refactor pokerus and add configs (#7731)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2026-01-14 12:04:33 +01:00
Alex
bb41e5622c
Refactor move target failure (#8696)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2026-01-13 15:13:38 -08:00
Eduardo Quezada
4df79828ac Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge 2026-01-11 15:06:42 -03:00
FosterProgramming
8ad0451914
Capture odds refactor and new catch rate modifiers (#8682)
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
2026-01-11 09:52:38 +01:00
Eduardo Quezada
45295d9544
B_ABILITY_TRIGGER_CHANCE config tests (#8594) 2026-01-06 15:53:29 +01:00
Kildemal
54b3a0e410
Add handling for Trick/Switcheroo behavior when both battlers are choice-locked (pre–Gen 5) (#8730) 2026-01-05 14:22:07 +00:00
Kildemal
ad6469718b
Add pre–Gen 4 handling for Hidden Power and Counter interaction (#8741) 2026-01-03 17:14:59 +01:00
moostoet
1510947001
Fix Rage generational inaccuracies (#8642) 2026-01-03 08:51:31 +01:00
AlexOn1ine
a1948b7c40 01/01/26 Master to upcoming merge 2026-01-01 10:24:19 +01:00
PhallenTree
22b78e924d
Counter/Mirror Coat/Metal Burst refactor (#8604) 2025-12-21 12:25:28 +01:00
Eduardo Quezada
828e12bee6
B_SPORT_DMG_REDUCTION config tests (#8593) 2025-12-20 15:47:46 +01:00
Eduardo Quezada
36e71c8236
B_BINDING_TURNS config tests (#8595) 2025-12-20 15:24:39 +01:00
Eduardo Quezada
44b658935f
B_TAILWIND_TURNS config tests (#8592) 2025-12-19 18:21:10 -05:00
Eduardo Quezada
9451af1c64
B_UPDATED_CONVERSION_2 config tests (#8573) 2025-12-19 16:17:24 +01:00
Hedara
e4ae9317c9 Merge branch 'master' into master-to-upcoming
Manual fixes to Lunar Dance handling

 Conflicts:
	include/battle_util.h
	src/battle_ai_main.c
	src/battle_ai_switch.c
	src/battle_ai_util.c
	src/battle_end_turn.c
	src/battle_script_commands.c
	src/battle_util.c
	test/battle/ai/ai_doubles.c
	test/battle/move_effect/snatch.c
	test/battle/spread_moves.c
2025-12-19 15:31:37 +01:00
Eduardo Quezada
66b6664938
B_REDIRECT_ABILITY_IMMUNITY config tests (#8571) 2025-12-18 23:26:50 -05:00
Eduardo Quezada
914a481308
B_BURN_DAMAGE config tests (#8574) 2025-12-18 18:53:35 -05:00
Eduardo Quezada
dc5ed3a85b
B_SYNCHRONIZE_TOXIC config test (#8572) 2025-12-18 18:52:15 -05:00
Eduardo Quezada
be9879f94a
B_IRON_BALL config test (#8569) 2025-12-18 18:48:54 -05:00
Eduardo Quezada
6e529cf221
B_KLUTZ_FLING_INTERACTION config test (#8568) 2025-12-18 18:45:54 -05:00
Eduardo Quezada
b78fccdb66
B_STURDY config test (#8565) 2025-12-18 17:24:52 -05:00
Eduardo Quezada
7b741c77f0
Added Light Ball tests (#8526) 2025-12-17 10:44:44 +01:00
FosterProgramming
bf0e1b1a86
Add missing behavior when using focus punch while surviving an OHKO move (#8484)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-12-17 00:56:59 +01:00
Eduardo Quezada
60e255ef5f
Finished Wish tests (#8530) 2025-12-16 15:40:21 +01:00
Eduardo Quezada
68aa18d0cb
B_SYMBIOSIS_GEMS tests (#8534) 2025-12-14 16:11:22 -05:00
Eduardo Quezada
5700fb08a2
Expanded B_SANDSTORM_SPDEF_BOOST test (#8532) 2025-12-14 18:14:27 +01:00
Eduardo Quezada
a3a16acd72
Expanded B_EXP_CATCH test (#8527) 2025-12-14 16:38:22 +01:00
Eduardo Quezada
a0a5947590
Added tests for stat-changing moves (#8278)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-12-14 16:24:39 +01:00
AlexOn1ine
23cefec579 08/12/25 master to upcoming merge 2025-12-08 18:15:19 +01:00
Pawkkie
6615310279
Improve self-sacrifice AI (#8427) 2025-12-04 18:57:47 +01:00
Eduardo Quezada
67e95e28e9
WITH_CONFIG Refactor (#7584) 2025-12-04 15:49:52 +01:00
Eduardo Quezada
f49a788bc6
Support Gen 2's Sandstorm not reducing Solar Beam's power (#8422)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-12-03 21:27:39 +01:00
Eduardo Quezada
115694675f
Renamed Config Test system to more general names (#7283) 2025-12-02 11:26:44 -05:00
PhallenTree
1fa97941c8
Updated Focus Punch failure check and moved to attackcanceler (#8360) 2025-11-30 18:37:57 +01:00