2251 Commits

Author SHA1 Message Date
Alex
e5e0800b90
Fixes Throat Spray being blocked by Sheer Force (#7808) 2025-09-27 15:59:31 -04:00
Alex
567a1290d4
Fixes Effects activating when move wasn't successful (#7803)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-27 19:55:12 +02:00
Alex
3c9f05b367
Fixes activation order for a couple abilities (#7732) 2025-09-27 18:47:10 +02:00
Alex
68e2bb5ab5
Fixes Leppa Berry timings (#7787)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-25 10:41:27 +02:00
Alex
66b7a7bf1e
Improve ability/heldEffect access for IsBattlerGrounded func (#7753) 2025-09-24 20:35:12 +02:00
PhallenTree
58b9642cb1
Fixes Instructed moves looking at the wrong turn order number (#7788) 2025-09-24 19:11:45 +02:00
Alex
a00b16fd90
Minor clean up for Lightning Rod / Storm Drain (#7778) 2025-09-22 23:47:44 +02:00
PhallenTree
5fad32decc
Fixes Helping Hand boosts not stacking with each other (#7775)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-09-22 20:00:34 +02:00
Alex
780867611e
Minor White Herb and Neutralizing Gas clean up (#7754) 2025-09-22 15:57:47 +02:00
bassforte123
abc471e9bd
Fixed Ball Fetch Ability (#7764) 2025-09-21 13:16:53 +02:00
Alex
40ffcfb94a
Remove redundant function call (#7752) 2025-09-20 11:19:25 +02:00
Alex
e92598e9e8
Fix up end turn scripts plus small documentation (#7758) 2025-09-19 20:07:24 +02:00
Alex
b6f1a6be5f
Wrong argument passed down (#7751) 2025-09-18 10:52:33 +02:00
AlexOn1ine
bc84e6656d Master to upcoming merge 2025-09-17 20:18:51 +02:00
grintoul
b365221a0c
Fix for Levitate and Mold Breaker being seen correctly by switch AI, with Levitate tests (#7748) 2025-09-17 18:32:50 +02:00
Alex
f671b130a6
Fixes Beat Up incorrect slots usage (#7741) 2025-09-17 11:40:40 +02:00
Alex
74de29a921
Bugfixes Batch (#7739) 2025-09-16 19:44:06 +02:00
PhallenTree
37e1188045
Fixes Recharge not actually being removed when recharge turn occurs (#7744) 2025-09-16 19:40:38 +02:00
Alex
32f8464fec
Attackcanceller fixes and improvements (#7698) 2025-09-16 18:00:30 +02:00
Eduardo Quezada
deaf77f619
Fix most failed and assume fail tests with GEN_LATEST = GEN_6 (#7696) 2025-09-14 20:21:38 +02:00
Alex
78a05c97ac
Refactors ruin ability checks into a field effect (#7711) 2025-09-14 14:41:10 +01:00
Alex
499e90ac4b
Fixes Endure and Eject Pack issues (#7687)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-12 18:09:46 +02:00
Alex
2f22780c17
Fixes Uproar not waking up mons (#7714) 2025-09-12 17:42:41 +02:00
PhallenTree
827dd4a67c
Fixes Intrepid Sword/Dauntless Shield boosting after entering while at max stats (#7716) 2025-09-10 16:38:09 +02:00
PhallenTree
8486e0e045
Fixes Weak Armor and items not displaying stat change attributes (#7701) 2025-09-07 20:30:00 +02:00
Hedara
1ec08fbe0d Merge branch 'master' into master-to-upcoming 2025-09-06 19:43:43 +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
Eduardo Quezada
5344d1ec63 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages 2025-08-28 16:50:18 -04: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
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
AlexOn1ine
ce52d83343 25/08/25 Master merge 2025-08-25 17:30:38 +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
Alex
208f97e1e3
Rename passive damage hitmarker (#2174) 2025-08-21 13:43:19 +01:00
Eduardo Quezada
7d459fd6dc
Fixed Transistor damage calculation test failing when GEN_LATEST is less than GEN_9 (#7577) 2025-08-18 19:44:43 +02:00
Eduardo Quezada
4986e06cae
Fixed B_PSYWAVE_DMG (#7557) 2025-08-15 09:03:21 +02:00
PhallenTree
c6ee7feaa3
Fixes some Ability Shield interactions (#7532) 2025-08-12 15:45:02 +02:00
Alex
f4c91b5539
Convert statuses3 to volatiles (#7514) 2025-08-11 23:19:36 +02:00
Eduardo Quezada
db0ca2ce49 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages 2025-08-11 12:39:28 -04:00
Eduardo Quezada
a9d5c2cd28
Updated Dream Eater/Liquid Ooze's interaction to Gen 5 standards (#7528) 2025-08-11 16:06:58 +02:00
AlexOn1ine
bd919e3219 11/08/25 Master to upcoming merge 2025-08-11 08:31:12 +02:00
Eduardo Quezada
c87d3b1769 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages 2025-08-10 21:29:01 -04:00
Alex
7de3663f38
Fixes Life Orb still activating if move was absorbed (#7521) 2025-08-10 16:58:36 +02:00
Eduardo Quezada
0b299b3ffd
Fixed most failed tests with GEN_LATEST GEN_8 (#7498) 2025-08-08 09:44:12 +02:00
Alex
acc82e7d79
Convert Status4 to volatiles (#7411)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-08-05 19:28:33 +02:00
PhallenTree
014f289ea9
Fixes Round and Fusion moves doubling power from previous turn's move (#7476) 2025-08-04 12:41:43 +02:00
Alex
3841fee888
Clean up noResultString (#7408) 2025-08-02 15:17:44 +02:00
Nephrite
73fd567520
Additional effects tweak (#7392)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-08-01 18:13:23 +02:00