Commit Graph

1734 Commits

Author SHA1 Message Date
Bassoonian
885180ff8b
27/02/26 Master to upcoming merge (#9384)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-28 15:58:05 +01:00
AlexOn1ine
0fc3ef056a 27/02/26 Master to upcoming merge 2026-02-27 23:53:24 +01:00
Bassoonian
310f746565
Fix space indentation in .s and .inc files (#9371)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-27 12:45:00 -08:00
Linathan
a635ac599d
Zen Mode Fix: Removes start battle form change and adds switch-out form change (#9304)
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
2026-02-25 19:35:16 +01:00
PhallenTree
81a5622b51
Move undoing Dynamax to before faint cry (#9317) 2026-02-23 20:40:37 +01: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
ccf71d2d6a
Fix Venom Drench bypassing Substitute (#9289) 2026-02-21 10:24:43 +01:00
GGbond
b7755887cc
Fix Tickle to be blocked by Substitute in Gen 4+ (#9288) 2026-02-21 10:23:49 +01:00
PhallenTree
199d7ae2cb
Fixes Rapid Spin and target defrost not being blocked by Sheer Force (#9252)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-19 14:24:39 +01:00
Alex
89fbaef8ba
Sky Drop Fixes/Refactor (#9185)
Some checks failed
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
2026-02-16 18:22:53 +01:00
PhallenTree
cf18d086b6
Adds CancelerSetTargets and improves Pre Attack Effects (#9178)
Some checks failed
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
2026-02-14 20:54:01 +01:00
Alex
ce15e5486d
Fixes Gulp Missile crash on targets that can be statused (#9179)
Some checks failed
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Docs / deploy (push) Has been cancelled
2026-02-10 20:13:27 +01:00
GGbond
20a986519d
Fix Aqua Ring reuse failure check and add Aqua Ring/Ingrain tests (#9174) 2026-02-10 10:00:42 +01:00
Alex
63fc5bf0fe
Strength Sap fixes (#9130)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-06 15:11:23 +01:00
Eduardo Quezada
32d1777b7a
Use direct config names instead of enum names (#8824)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-02-06 11:57:33 +01:00
Alex
829488e761
Merge branch 'upcoming' into master-merge-3 2026-01-30 12:55:34 +01:00
AlexOn1ine
396c64c22a 30/01/26 Master to upcoming merge 2026-01-30 12:49:21 +01:00
Eduardo Quezada
278739ee66
Form Change Improvements (#8850)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-01-29 00:35:08 +01:00
cawtds
97e83ebe6a
Add FRLG (#7423) 2026-01-28 17:41:12 +01:00
Alex
0c44cc1b27
Move Target failure follow up (#8986)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2026-01-28 15:48:14 +01:00
Alex
c8eb55969e
Add accuracy check to BattleScript_EffectNightmare (#9032)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-01-27 16:17:25 +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
e871913e22
Fix Magnetic Flux target handling in singles (#9007) 2026-01-24 08:45:19 +01:00
Alex
6c05a08750
Refactor OHKO Moves (#8916) 2026-01-21 11:55:30 +01:00
GGbond
128beb39e1
Fixed several issues with Parting Shot (#8928) 2026-01-20 22:06:50 +01:00
Alex
922db5ce4a
Move adjustdamage to the damage calc (#8948) 2026-01-20 12:30:00 +01:00
Alex
de7aaf854c
Misc battle engine changes (#8931) 2026-01-16 18:55:22 +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
Alex
550469891a
Add setpreattackadditionaleffect and use it for brick break / spectra… (#8719) 2026-01-12 17:13:39 +01:00
Eduardo Quezada
4df79828ac Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge 2026-01-11 15:06:42 -03:00
GGbond
b671adf85f
Fixes Nightmare not affecting Comatose and adds various missing tests (#8859) 2026-01-11 15:02:41 +00:00
PhallenTree
ad6b64432e
Improve IsBattlerSpritePresent's alive check (#8847) 2026-01-09 14:59:37 +01:00
Hedara
7fed5c93bb Merge branch 'upcoming' into master-to-upcoming 2026-01-04 17:34:20 +01:00
PhallenTree
a06894b5ee
Ability Shield allows for ability activation when obtained and Trick cleanup (#8784) 2026-01-04 17:23:36 +01:00
PhallenTree
bda2064ecf
Fixes Chilly Reception displaying its message when called by another move (#8795) 2026-01-04 16:50:43 +01:00
Hedara
78124e88d7 Merge commit '0e33bf916e80e4dcf4f96ca0419a8b2fda5da51d' into master-to-upcoming
Conflicts:
	src/battle_main.c
	test/battle/ability/beads_of_ruin.c
	test/battle/ability/commander.c
	test/battle/ability/desolate_land.c
	test/battle/ability/primordial_sea.c
	test/battle/ability/supreme_overlord.c
	test/battle/ability/sword_of_ruin.c
	test/battle/ability/tablets_of_ruin.c
	test/battle/ability/vessel_of_ruin.c
	test/battle/ai/ai.c
	test/battle/ai/ai_multi.c
	test/battle/ai/ai_switching.c
	test/battle/gimmick/dynamax.c
	test/battle/move_effect/counter.c
	test/battle/move_effect/fling.c
	test/battle/move_effect/mirror_coat.c
	test/battle/move_effect/misty_explosion.c
	test/battle/move_effect/protect.c
	test/battle/move_effect/psychic_terrain.c
	test/battle/move_effect/sticky_web.c
	test/battle/trainer_slides.c
2026-01-04 11:28:59 +01:00
Alex
d9da5ee874
Fix Red Card / Eject Button interaction (#8780) 2026-01-03 16:54:04 +00:00
Alex
e04028420a
Further weather consolidation (#8161) 2026-01-03 15:39:22 +01:00
moostoet
1510947001
Fix Rage generational inaccuracies (#8642) 2026-01-03 08:51:31 +01:00
moostoet
0e33bf916e
Fix berry activation timing for Yawn sleep and Leech Seed damage (#8776) 2026-01-03 08:50:17 +01:00
AlexOn1ine
a1948b7c40 01/01/26 Master to upcoming merge 2026-01-01 10:24:19 +01:00
grintoul
a71fc91484
Trainer slides for multiple trainers and multibattles (#7588)
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-12-30 20:28:53 +00:00
grintoul
dcc584c6d6
Fixes incorrect battler used in STRINGID_USEDINSTRUCTEDMOVE (#8704) 2025-12-29 21:57:10 +01:00
Alex
3a8fdf9fad
Create battle_move_resolution.c (#8703) 2025-12-29 16:13:45 +01:00
PhallenTree
d5c40bbbdd
Add Move End Faint Block (#8673) 2025-12-28 20:44:39 +01:00
spindrift64
582a643d1f
fix poisons absorbing toxic spikes when fainting from other hazards (#8644) 2025-12-23 21:47:42 +01:00
Alex
4d69a7274f
Stockpile / WishFutureKnock / Order up clean up (#8528) 2025-12-22 19:57:54 +01:00