18501 Commits

Author SHA1 Message Date
surskitty
406e5b1def
IncreaseStatUpScore adjustments for Simple, +3 moves, Acupressure, max move effects (#7662) 2025-09-01 19:02:56 +02:00
surskitty
cdaba9076e
Correcting test AI won't use status moves if partner chose Helping Hand (#7649) 2025-08-30 23:18:47 +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
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
psf
04622b202f
Start of 1.14 (#7637) 2025-08-28 08:08:57 -07:00
Hedara
2ab1bc87e0 Start of 1.14 cycle 2025-08-28 16:46:58 +02:00
psf
9a6010fe27
Expansion release, 1.12.3 and 1.13.0 (#7636) 2025-08-28 07:42:00 -07:00
Hedara
9ff4c48f77 Start of 1.13.1 cycle 2025-08-28 16:16:40 +02:00
Hedara
7056aaba6e Expansion version 1.13.0 2025-08-28 16:15:09 +02:00
Hedara
acf7f0c6e1 Merge branch 'upcoming' into expansion-release 2025-08-28 16:13:58 +02:00
Hedara
d812b58064 Expansion version 1.12.3 2025-08-28 15:49:29 +02:00
hedara90
7b1430f3a7
Master to upcoming 28/08/25 (#7635) 2025-08-28 15:36:03 +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
Alex
a45d36d90f
The original attacker wasn't restored for Doodle (#7620)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-08-26 22:16:57 +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
hedara90
509b4ec5dd
Fixed typo in test name (#7610)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-08-24 17:31:48 +02:00
Eduardo Quezada
8febd24604
Added missing Move Effect TODO tests - Volume F (#7605) 2025-08-23 22:25:19 +02:00
Eduardo Quezada
f009550137
Added Ability TODO tests - Volume C (#7562) 2025-08-22 20:24:26 +02:00
FosterProgramming
1e6bb4f47c
Fix overlap between spin evolution and script evolution (#7593) 2025-08-22 20:23:18 +02:00
Alex
c80a41b730
Suppress trainerproc compile warning for unused func (#7592) 2025-08-21 17:31:59 +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
surskitty
8e58551088
Tests to see that the AI uses moves. (#7555) 2025-08-21 14:41:43 +02:00
RavePossum
2d9dc28b7a
Fix in-game partner battles always causing a whiteout (#7587) 2025-08-21 12:44:15 +02:00