Commit Graph

611 Commits

Author SHA1 Message Date
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
Pawkkie
354cdab5e0
Fix AI_FLAG_RANDOMIZE_SWITCHIN logic (#9128)
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-05 21:24:14 +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
khbsd
703d108548
fix(battle ui): standardize hp bar color logic for GEN_5 and up (#9083) 2026-02-03 11:16:00 +01:00
PhallenTree
022f5eb52e
Fixes Infiltrator and adds config for Substitute interaction (#9073)
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-30 14:14:35 +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
cawtds
97e83ebe6a
Add FRLG (#7423) 2026-01-28 17:41:12 +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
FosterProgramming
fe2c154b89
Refactor chooseboxmon (#8491)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-01-22 19:54:19 +01:00
GGbond
128beb39e1
Fixed several issues with Parting Shot (#8928) 2026-01-20 22:06:50 +01:00
Kasenn
ef48a4d155
Change HP bar color calculation from pixel-width to actual values (#8694) 2026-01-15 10:52:24 +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
spindrift64
f3f4b06d2c
Add config flag to skip save overwrite confirmation (#8659) 2026-01-13 22:56:07 +01:00
amiosi
481e0370b5
Gen 3 Lax Incense (#8864) 2026-01-13 15:10:37 +01:00
Eduardo Quezada
46e23967ec Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge 2026-01-11 15:08:31 -03:00
Eduardo Quezada
4df79828ac Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge 2026-01-11 15:06:42 -03:00
amiosi
0870fe24c7
Miscellaneous species_info Changes (#8462) 2026-01-11 18:54:43 +01: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
Alex
c76c3b37bb
Refactor protect failure to match vanilla (#8832) 2026-01-10 18:23:01 +01:00
amiosi
dc128c608b
add the type boost value for gen 3 sea incense (#8826) 2026-01-08 11:35:21 +01:00
PCG
d34c7f0ba6
Refactor move relearner and small #8027 follow-up (#8675) 2026-01-07 14:49:39 +01:00
amiosi
126100c027
fix crash damage implementation and incorrect memento generation (#8804)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-01-06 00:18:46 +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
FosterProgramming
8c9d3b9c7a
Add gym leader support for vs seeker and clean vs seeker code (#8172)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2026-01-04 20:03:41 -08:00
Hedara
82c474bcd0 Merge branch 'master' into master-to-upcoming
Conflicts:
	include/config/battle.h
2026-01-04 17:31:25 +01:00
amiosi
c506d52d32
Miscellaneous fixes to configs and other values (#8662) 2026-01-03 17:34:30 +01: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
lordraindance2
eee89c0a60
Added a include/config option to change mega cry sounds (#7558) 2026-01-02 10:19:34 +01:00
FosterProgramming
30e5fc6958
Refactoring the way teachable learnsets are generated (#8027) 2025-12-26 13:13:29 +01:00
Pawkkie
0551fcf408
Add Dynamic Switch AI Function (#8629) 2025-12-25 02:02:01 +01:00
PhallenTree
22b78e924d
Counter/Mirror Coat/Metal Burst refactor (#8604)
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-21 12:25:28 +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
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
Eduardo Quezada
3feeebce9b
Fix GEN_6_ORAS definition (#8537) 2025-12-16 16:12:38 +01:00
Alex
4ae2f03e02
Move disable struct members to battle mon volatiles (#8540) 2025-12-16 15:53:35 +01:00
psf
e65f30bf60
Add OW_BERRY_COLORS and update gBerries to match (#8353) 2025-12-14 16:56:30 +01:00
Pawkkie
f5c4f403ca
AI ShouldPivot Overhaul (#8486) 2025-12-12 23:04:32 +01:00
Pawkkie
f26f019947
Add AI switchin quality consideration configs (#8508) 2025-12-12 23:03:33 +01: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
amiosi
328ec9d708
Generational Move Changes (#8405)
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-06 23:50:58 +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
hedara90
22492a6494
Make TRUE and 1 behave the same in config/species_enabled.h (#8421)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-12-04 15:27:50 +01:00
FosterProgramming
f3d43e286d
Fix substitute/defog interactions (#8418) 2025-12-04 15:24:53 +01:00