512 Commits

Author SHA1 Message Date
PhallenTree
022f5eb52e
Fixes Infiltrator and adds config for Substitute interaction (#9073) 2026-01-30 14:14:35 +01:00
Alex
ac221a3aa8
Fix incorrectly applied change in atkcanceler (#8641) 2025-12-24 01:16:26 +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
moostoet
755bec128b
Fix incorrect "last to move" check for Analytic, Snatch, and Magic Coat (#8536) 2025-12-15 15:56:17 +01:00
moostoet
d0965814fe
Fix Costar not copying partner's critical hit boosts (#8386) 2025-12-02 21:25:52 +01: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) 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) 2025-11-18 23:34:36 +01:00
Alex
e445160c92
Adjust Canceler naming to contain only one l (#8258) 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
FosterProgramming
6c3f87e74e
Fix bug when a captured pokemon replaces a party member who changed forms (#8091) 2025-10-31 17:50:29 +01:00
Eduardo Quezada
8de86ba243
Fixed Belly Drum/Contrary interaction at max Attack (#8078) 2025-10-30 17:14:07 +01:00
Hedara
a2ef3284dd Merge branch 'master' into master-to-upcoming
Conflicts:
	data/battle_scripts_1.s
	include/battle_util.h
	include/constants/battle.h
	src/battle_script_commands.c
	src/battle_util.c
2025-10-29 18:42:59 +01:00
grintoul
c90e6952f3
Fix Ally Switch being useable in Frontier Link Multi battles (#8059)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-10-28 19:26:10 +01:00
Bassoonian
f7cbe4853b
Add type enum (#8054) 2025-10-27 16:41:22 +00:00
Alex
4ed1c3309d
Decouple (overworld) statuses from ability function (#8002) 2025-10-26 13:57:34 +00:00
AlexOn1ine
6acabd4ba2 Master to upcoming merge 2025-10-25 16:19:32 +02:00
Bassoonian
be23dfdf2a
Even more enums and documentation (#8029) 2025-10-25 14:37:47 +02:00
Alex
65244cbeb4
Moved usedHeldItem to Party State struct (#8006) 2025-10-24 18:56:16 +02:00
Alex
8ea947d5a1
Fixes Protosynthesis not activating after weather was reset (#8021) 2025-10-24 18:53:34 +02:00
Bassoonian
fb660061ab
Converts some defines to enums and name unnamed enums (#8019) 2025-10-23 18:06:29 +02:00
FosterProgramming
1343ddf7c3
Fix badge boost not applying in gen1 and 2 (#8013) 2025-10-22 22:57:04 +02:00
Alex
cb0d503f66
Decouple passive hp updates from move damage updates (#7942) 2025-10-19 16:40:13 +02:00
spindrift64
de3c031fc5
Fix Anticipation type effectiveness check (#7840) 2025-10-16 14:36:07 +02:00
Alex
3ad78d0079
Clean up follow up for AtkCanceller refactor (#7951) 2025-10-14 18:07:56 +01:00
Alex
eee546df06
Item battle effect refactor (#7857) 2025-10-12 08:59:33 +02:00
AlexOn1ine
870b93aad9 06/10/25 Master to upcoming merge 2025-10-06 19:42:42 +02:00
FosterProgramming
2156651313
No bag use flag changed to a varable (#7780)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-10-01 14:51:09 +02:00
Alex
3ea095a941
More White Herb fixes/clean up (#7826)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-30 21:16:02 +02:00
spindrift64
2231b2fdca
Immunity abilities trigger on turn 0 (leads) (#7814) 2025-09-30 19:07:23 +02:00
khbsd
db43fc3c83
followup: AbilityBattleEffects return type is incorrect (#7827) 2025-09-30 00:05:20 +02:00
khbsd
e385c7f59f
feat: change defines in constants/abilities.h to an enum (#7006)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-09-29 21:35:09 +02:00
Alex
09aa452659
Fix Throat Spray activating multiply times (#7818) 2025-09-29 19:32:11 +02:00
Alex
a818b97732
GetBattlerHoldEffect clean up (#7819)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-09-29 17:16:15 +02:00
Alex
3c9f05b367
Fixes activation order for a couple abilities (#7732) 2025-09-27 18:47:10 +02:00
Alex
66b7a7bf1e
Improve ability/heldEffect access for IsBattlerGrounded func (#7753) 2025-09-24 20:35:12 +02:00
Alex
780867611e
Minor White Herb and Neutralizing Gas clean up (#7754) 2025-09-22 15:57:47 +02:00
Alex
32f8464fec
Attackcanceller fixes and improvements (#7698) 2025-09-16 18:00:30 +02:00
Alex
78a05c97ac
Refactors ruin ability checks into a field effect (#7711) 2025-09-14 14:41:10 +01:00
PhallenTree
8486e0e045
Fixes Weak Armor and items not displaying stat change attributes (#7701) 2025-09-07 20:30:00 +02:00
Alex
0422340356
Refactors Attackstring and PP deduction (#7402) 2025-09-03 20:25:27 +02:00