13536 Commits

Author SHA1 Message Date
Martin Griffin
97376a5b5a Support gimmicks in AI tests 2025-09-05 07:31:13 +01:00
grintoul
6e18c2f06e
Tidy up CanTargetFaintAiWithMod and CanTargetMoveFaintAi (#7693)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-09-04 15:18:51 +02:00
Alex
0422340356
Refactors Attackstring and PP deduction (#7402) 2025-09-03 20:25:27 +02:00
Eduardo Quezada
1e6a533131
Fix most failed tests with GEN_LATEST = GEN_7 (#7688) 2025-09-03 19:23:23 +02:00
grintoul
a8e60a8ba3
Trainers trigger in local id order (#7424)
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2025-09-02 23:14:23 +02:00
Eduardo Quezada
f39fdf57cf
Fixed disabled cross-evolutions still being possible (#7678) 2025-09-02 15:46:48 +02:00
Hedara
837047ea44 Merge branch 'master' into master-to-upcoming 2025-09-02 15:00:59 +02:00
surskitty
2f75c6a264
Score adjustments towards guaranteed stat drops. (#7670) 2025-09-02 11:31:35 +02:00
surskitty
84f5aa6dae
Helping Hand bugfix; used FOE instead of BATTLE_OPPOSITE. (#7659) 2025-09-01 21:43:04 +02:00
surskitty
0a0d574998
Simplifying calls to IsBattlerTrapped; treats being unable to switch as trappedness (#7671) 2025-09-01 21:34:31 +02:00
surskitty
927f1898bb
AI handling for Coaching. (#7661) 2025-09-01 19:43:12 +02:00
surskitty
406e5b1def
IncreaseStatUpScore adjustments for Simple, +3 moves, Acupressure, max move effects (#7662) 2025-09-01 19:02:56 +02:00
Frank DeBlasio
674cd13659
Added sortType to Douse Drive (#7664) 2025-08-31 20:53:23 +02:00
surskitty
4fa26b2296
Improved move additional effect handling; now accounts for Shield Dust. (#7650) 2025-08-30 22:40:44 +02:00
grintoul
70068bf314
Battle debug menu now checks correct parties depending on battler party (#7652) 2025-08-30 22:39:02 +02:00
Bassoonian
33686c31aa
Update multiple battle messages (#7529) 2025-08-30 16:58:50 +02:00
hedara90
7302de4209
Replace boolean multiplications with ternaries (#7653)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-08-30 11:22:02 +02:00
surskitty
e1381dd7b5
AI uses Gear Up. (#7641) 2025-08-29 20:49:50 +02:00
surskitty
3ff23ef212
AI uses Life Dew. (#7643) 2025-08-29 20:49:28 +02:00
surskitty
16fa6c8f71
AI uses Flower Shield. (#7640) 2025-08-29 10:10:59 +02:00
surskitty
9bfae7fa93
AI uses Magnetic Flux. (#7642) 2025-08-29 10:08:42 +02:00
Eduardo Quezada
5344d1ec63 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages 2025-08-28 16:50:18 -04:00
Martin Griffin
f07112bda6
Text rendering optimizations (#7497) 2025-08-28 21:24:27 +02:00
grintoul
a2e1835993
Separates FRB and FRZ animations (#7611) 2025-08-28 19:07:08 +02:00
AlexOn1ine
ce77c48142 remove unused var 2025-08-28 14:23:44 +02:00
AlexOn1ine
1131b205f2 conflicts 2025-08-28 14:09:38 +02:00
ghoulslash
de790e4815
Ally Switch attract battler swapping, test for leech seed (#7634)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-08-28 13:51:02 +02:00
PhallenTree
f0bd3d544e
Fixes Wonder Room interactions with Defense/Special Defense boosting effects (#7626) 2025-08-27 16:16:11 +02:00
RavePossum
2fbf45d057
Restore X item friendship increase (#7583) 2025-08-26 22:17:30 +02:00
psf
8044255fee
Fix Vs Seeker Trainer Battle script issue (#7615) 2025-08-26 15:25:18 +02:00
Bassoonian
28e7a25989
25/08/25 Master merge (#7618) 2025-08-26 15:23:24 +02:00
Alex
e2f24bbb3f
Prevents a regression for custom abilties (#7616) 2025-08-25 17:37:57 +02:00
Alex
1bb9a1c86b
Remove unused function (#7617) 2025-08-25 17:36:43 +02:00
AlexOn1ine
ce52d83343 25/08/25 Master merge 2025-08-25 17:30:38 +02:00
Alex
6df3a48ca2
Fixes octolock not ending after user switched out (#7556)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-08-25 15:46:36 +02:00
RavePossum
0a3c281cdd
Fix terastallization anims flickering (#7613) 2025-08-25 11:48:52 +02:00
Alex
ff3e8da007
Minor Clean up in battle_ai_main.c (#7551) 2025-08-25 11:46:23 +02:00
Alex
53e7699649
Fixes Explosion behavior when 3 mons can endure hit (#7594) 2025-08-25 11:41:36 +02:00
ghoulslash
9b5b69ae49
switchinabilities also runs ON_WEATHER and ON_TERRAIN (#7612)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-08-25 11:40:52 +02:00
Alex
e3178d3ff6
Fix duplicate switch in after faint (#7600) 2025-08-24 13:06:13 -04:00
FosterProgramming
1e6bb4f47c
Fix overlap between spin evolution and script evolution (#7593) 2025-08-22 20:23:18 +02:00
Alex
504d3bc31f
Fixes moveend_absorb hitmarker (#7591) 2025-08-21 16:49:13 +02:00
Alex
f24b919a11
Pret merge (21 of August, 2025) (#7590) 2025-08-21 16:05:50 +02:00
Alex
c0231c9bb1
Fixes Rage Fist counter increment (#7582)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-08-21 15:46:31 +02:00
Hedara
da77dba59f Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	data/battle_scripts_1.s
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
2025-08-21 15:40:38 +02:00
hedara90
95eb3ba1a7
Fix B_ANIMATE_MON_AFTER_KO with a new counter (#7531)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2025-08-21 14:43:41 +02:00
Alex
208f97e1e3
Rename passive damage hitmarker (#2174) 2025-08-21 13:43:19 +01:00
PhallenTree
553e5bd09c
Fixes refusing to replace a move on evolution causing a softlock (#7585) 2025-08-20 18:26:48 +02:00
grintoul
888783aaa5
Restore AI: Basic Trainer to PARTNER_STEVEN (#7586) 2025-08-20 10:22:19 -04:00
Eduardo Quezada
96653e704e
Fixed Teleport's description not being updated based on B_TELEPORT_BEHAVIOR (#7580) 2025-08-19 14:39:20 +02:00