549 Commits

Author SHA1 Message Date
AlexOn1ine
aa20b2bc0f master to upcoming merge 2025-11-22 10:39:52 +01:00
PhallenTree
65a5d1e7d8
Fixes Neutralizing Gas displaying message when exiting with multiple users (#8318) 2025-11-21 19:58:02 +01:00
AlexOn1ine
6a28506ee2 19/11/25 Master to upcoming merge 2025-11-19 18:20:30 +01:00
moostoet
0f4d325467
Fix Fur Coat affecting confusion self-damage (#8267) 2025-11-18 23:34:36 +01:00
Eduardo Quezada
6cf1305178
Yet more tests (#8228)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-11-16 16:23:38 +01:00
FosterProgramming
85568422fd
Add test for mold breaker/ice scales interaction (#8240)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-11-13 22:51:44 +01:00
Eduardo Quezada
b72c2b244b
Fixed some failing tests with GEN_LATEST = GEN_5 (#8241) 2025-11-13 22:50:21 +01:00
Eduardo Quezada
49838a004e
A couple more tests (#8209)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-11-12 21:48:27 +01:00
Eduardo Quezada
1545e22d0a
Clean usage of gMovesInfo (#8234) 2025-11-12 19:29:45 +01:00
Alex
03b6200af5
Fixes Drain Punch / Parental Bond / Scale Shot interaction (#8198) 2025-11-11 17:41:56 +01:00
Eduardo Quezada
2dc36a8ba0
Wrote some missing tests (#8203) 2025-11-11 13:52:24 +01:00
AlexOn1ine
93cc143134 conflicts 2025-11-11 13:12:00 +01:00
PhallenTree
649798449e
Powder Move blocking cleanup (#8194) 2025-11-10 21:01:35 +01:00
Eduardo Quezada
ffc2c04ea6
Added Soundproof and Bulletproof tests (#8189) 2025-11-10 15:58:42 +01:00
Alex
6c383fac96
Fixes Magician for spread moves (#8170) 2025-11-09 18:10:11 +01:00
ghostyboyy97
0bd9dd6ee8
fix (contrary): Contrary stat down handling in MoveEffectInPlus (#8165)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-11-08 17:21:16 +01:00
grintoul1
c230e54678 Master to Upcoming merge 20251107 2025-11-07 22:45:57 +00:00
PhallenTree
b8dc1968f3
Fixes Receiver not immediately activating copied Soul Heart (#8162) 2025-11-07 19:23:00 +01:00
grintoul
2f44846c2b
Sheer force test fix (#8142) 2025-11-07 14:47:08 +01:00
Alex
0f14a4db57
Clean up ability effect hitmarker (#8138) 2025-11-04 21:44:57 +00:00
ghostyboyy97
3c72ca1158
fix (AI scoring): shield dust considerations, IsMoveEffectInMinus self effect edge case, hitsToKO zero-case consideration (#8126)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-11-04 09:35:43 +01:00
Hedara
b0ccddac69 Merge branch 'master' into master-to-upcoming
Conflicts:
	include/constants/expansion.h
2025-11-03 11:11:07 +01:00
grintoul
dba50c91ea
Aura Break tests (#8099) 2025-11-01 13:43:31 +01:00
AlexOn1ine
d4e7e7ad36 10/11/25 Master to upcoming merge 2025-11-01 11:54:17 +01:00
Eduardo Quezada
f66ba68eee
Fixed Zygarde Complete disappearing upon catch (#8089) 2025-10-31 19:41:46 +01:00
Alex
3a3b947622
Fixes intimidate activating on empty field (#8058)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-10-30 17:51:57 +01:00
PhallenTree
9d06a4fb55
Emergency Exit on hazards activation + fix end of turn activation (#8075) 2025-10-30 17:01:13 +01:00
Alex
c77c624e9f
Fixes Gooey/Tangling Hair ability pop up triggering on Clear Body (#8083) 2025-10-30 16:14:03 +01:00
Eduardo Quezada
814cf53629
Fixed Hunger Switch changing forms on switch out while Tera'd (#8080) 2025-10-30 15:43:50 +01:00
Hedara
a2ef3284dd Merge branch 'master' into master-to-upcoming
Conflicts:
	data/battle_scripts_1.s
	include/battle_util.h
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
2025-10-29 18:42:59 +01:00
Alex
dd875b87bc
Combine Simple Beam and Worry Seed into one effect (#8039)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-10-29 15:20:12 +01:00
Alex
ea60c32fbe
Fixes Liquid Ooze dmg not blocked by Magic Guard (#8036)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-10-29 15:19:50 +01:00
Bassoonian
f7cbe4853b
Add type enum (#8054) 2025-10-27 16:41:22 +00:00
PhallenTree
782c559a20
Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042) 2025-10-26 22:41:16 +01:00
FosterProgramming
6faf35dde9
Fix emergency exit not triggering properly during wild battles (#8037) 2025-10-26 22:35:27 +01:00
AlexOn1ine
6acabd4ba2 Master to upcoming merge 2025-10-25 16:19:32 +02:00
Alex
8ea947d5a1
Fixes Protosynthesis not activating after weather was reset (#8021) 2025-10-24 18:53:34 +02:00
FosterProgramming
8c87522415
Fix toxic debris setting hazards on the wrong side when hit by an ally (#8026) 2025-10-24 11:50:19 +02:00
hedara90
3bb6cddffb
Fix Minior start of battle form (#7972)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-10-21 16:39:02 +02:00
PhallenTree
38221b9de5
Fixes Shields Down incorrectly preventing status on Minior Core form (#7968) 2025-10-17 20:40:37 +02:00
FosterProgramming
864377f99a
Fix Cherim and Castfrom not reverting to baseform when Teraform Zero is triggered (#7961) 2025-10-16 19:19:31 +02:00
spindrift64
de3c031fc5
Fix Anticipation type effectiveness check (#7840) 2025-10-16 14:36:07 +02:00
AlexOn1ine
e365add4cf 15/10/25 Master to upcoming merge 2025-10-15 21:31:00 +02:00
grintoul
7e98dffc51
Tests for Battery ability (#7846) 2025-10-15 14:31:09 +02:00
PhallenTree
78b11bb35f
Fixes Cursed Body failing to disable moves on the last PP (#7940) 2025-10-13 13:55:39 +02:00
Alex
eee546df06
Item battle effect refactor (#7857) 2025-10-12 08:59:33 +02:00
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
PhallenTree
4d12c35eb3
Fixes Steadfast not activating + tests (#7886) 2025-10-08 16:01:29 +02:00
AlexOn1ine
870b93aad9 06/10/25 Master to upcoming merge 2025-10-06 19:42:42 +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