Commit Graph

543 Commits

Author SHA1 Message Date
Alex
da62ebcffd
Move attack canceler to the move resolution file (#8921) 2026-01-21 12:11:37 +01:00
Alex
6c05a08750
Refactor OHKO Moves (#8916) 2026-01-21 11:55:30 +01:00
Bassoonian
36fcd9c6b2
Adds `Item` enum (#8897) 2026-01-17 02:26:09 -08:00
Bassoonian
786c3d948f
Battle file cleanup & documentation (#8903) 2026-01-14 12:17:21 +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
Alex
c76c3b37bb
Refactor protect failure to match vanilla (#8832) 2026-01-10 18:23:01 +01:00
PhallenTree
bda2064ecf
Fixes Chilly Reception displaying its message when called by another move (#8795) 2026-01-04 16:50:43 +01:00
Bassoonian
01fd137182
Convert `IsMonBannedFromSkyBattles` table to species flag (#8793) 2026-01-04 16:03:15 +01:00
Bassoonian
66df755e9a
Extra enum typechecking (#8786) 2026-01-04 12:48:21 +01:00
Bassoonian
3755e51a24
Move enum (#8739) 2026-01-03 17:43:48 +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
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
Alex
ac221a3aa8
Fix incorrectly applied change in atkcanceler (#8641)
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
2025-12-24 01:16:26 +01:00
Alex
644b04a9f4
Move Explosion to attackcanceler and Terrain Boost effect (#8612) 2025-12-22 18:52:28 +01:00
ghostyboyy97
a901d227cc
fix (scoring): AI_IsMoveEffectInPlus - AI should not see secondary effect of Sheer Force boosted moves as beneficial (#8579)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-12-19 12:40:46 -05: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
Alex
71a1967b7b
Move target type refactor (#8513) 2025-12-18 13:12:41 +01:00
FosterProgramming
bf0e1b1a86
Add missing behavior when using focus punch while surviving an OHKO move (#8484)
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: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-12-17 00:56:59 +01:00
Alex
4ae2f03e02
Move disable struct members to battle mon volatiles (#8540) 2025-12-16 15:53:35 +01:00
moostoet
755bec128b
Fix incorrect "last to move" check for Analytic, Snatch, and Magic Coat (#8536) 2025-12-15 15:56:17 +01:00
Pawkkie
612ff122bf
Fix switch AI caring about super effective Snore (#8500)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2025-12-15 10:27:33 +01:00
Alex
5509268d6b
Fix potential bug with CanBattlerGetOrLoseItem (#8518) 2025-12-13 13:14:48 -05:00
Alex
889d11fa02
Add fieldStatuses argument to Ai_CalcDamage for switch in calc (#8490) 2025-12-10 11:50:26 -05:00
Eduardo Quezada
04da8aa285
Allow Starting Statuses beyond 15 (#8485) 2025-12-09 16:24:23 +01:00
AlexOn1ine
23cefec579 08/12/25 master to upcoming merge 2025-12-08 18:15:19 +01:00
Alex
a42f921939
Streamline unable to use move flags (#8415) 2025-12-07 18:41:48 +01:00
Alex
0fd0e50d8a
Renames for struct BattleContext and DamageContext (#8426) 2025-12-04 13:52:15 -05:00
moostoet
d0965814fe
Fix Costar not copying partner's critical hit boosts (#8386)
Some checks are pending
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2025-12-02 21:25:52 +01:00
Alex
49a18df48a
Refactor Fury Cutter and Rollout (#8375) 2025-12-02 16:45:34 +01:00
Pawkkie
8d42cb92c2
Add Smarter AI Resist Berry Handling (#8376)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-12-01 19:51:43 +01:00
Alex
55fbbfa586
Move crit calculation into the damage calc (#8365)
Some checks failed
CI / build (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-11-30 13:58:51 -05:00
PhallenTree
1fa97941c8
Updated Focus Punch failure check and moved to attackcanceler (#8360) 2025-11-30 18:37:57 +01:00
Alex
f222bcaff5
Switch-in Events Refactor (#8128) 2025-11-30 08:25:20 -08:00
AlexOn1ine
15d9342fe5 30/11/25 master to upcoming merge 2025-11-30 14:57:50 +01:00
Hedara
bf1dd201d3 Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	INSTALL.md
	asm/macros/battle_script.inc
	data/battle_scripts_1.s
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
2025-11-30 11:56:57 +01:00
hedara90
ce858f51b2
27/11/25 Master to upcoming merge (#8359)
Some checks failed
CI / build (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
2025-11-27 21:07:59 +01:00
Alex
2d628aca0e
Move end clear bits clean up (#8354)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-11-27 17:42:16 +01:00
AlexOn1ine
68300e0f9a 27/11/25 Master to upcoming merge 2025-11-27 13:39:12 +01:00
AlexOn1ine
6a28506ee2 19/11/25 Master to upcoming merge 2025-11-19 18:20:30 +01:00
AlexOn1ine
6aa84c8fa1 Canceller -> Canceler rename 2025-11-19 16:06:52 +01:00
moostoet
0f4d325467
Fix Fur Coat affecting confusion self-damage (#8267)
Some checks are pending
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2025-11-18 23:34:36 +01:00
Alex
e445160c92
Adjust Canceler naming to contain only one l (#8258)
Some checks are pending
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2025-11-15 18:44:16 +01:00
mitsunee
73ec0813e1
Standardize spelling of "canceler"
just a quick grep -r and regex substitution, but didn't see anything wrong in the diffs during a quick proofread
2025-11-15 12:11:32 +01:00
Martin Griffin
12b65b565b
DamageContext: chosenMove (#8224) 2025-11-11 21:59:18 +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
AlexOn1ine
d4e7e7ad36 10/11/25 Master to upcoming merge 2025-11-01 11:54:17 +01:00