2251 Commits

Author SHA1 Message Date
Alex
be5f6d4801
Fixes hacky SetMoveEffect script calls (#7987) 2025-11-04 17:47:35 +00:00
Eduardo Quezada
51a6081c8e
Parametrized Ice Face's weather form change (#8115) 2025-11-02 20:31:09 +01:00
AlexOn1ine
d4e7e7ad36 10/11/25 Master to upcoming merge 2025-11-01 11:54:17 +01:00
Eduardo Quezada
f66ba68eee
Fixed Zygarde Complete disappearing upon catch (#8089) 2025-10-31 19:41:46 +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
Alex
1c1a98ee45
Grudge, Destiny Bond and FaintBattler refactor (#8072)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-10-30 23:14:02 +01:00
Alex
3a3b947622
Fixes intimidate activating on empty field (#8058)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-10-30 17:51:57 +01:00
Eduardo Quezada
8de86ba243
Fixed Belly Drum/Contrary interaction at max Attack (#8078) 2025-10-30 17:14:07 +01:00
PhallenTree
9d06a4fb55
Emergency Exit on hazards activation + fix end of turn activation (#8075) 2025-10-30 17:01:13 +01:00
Eduardo Quezada
814cf53629
Fixed Hunger Switch changing forms on switch out while Tera'd (#8080) 2025-10-30 15:43:50 +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
PhallenTree
782c559a20
Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042) 2025-10-26 22:41:16 +01: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
FosterProgramming
8c87522415
Fix toxic debris setting hazards on the wrong side when hit by an ally (#8026) 2025-10-24 11:50:19 +02:00
Bassoonian
fbd702e3a4
Some more documentation and cleanup (#8020) 2025-10-23 20:14:38 +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
PhallenTree
2416bfb53b
Fixes Echoed Voice base power increase depending on attacker's use of the move (#7997) 2025-10-22 13:39:24 +02:00
FosterProgramming
24c595bfec
Fix psychic terrain affecting semi-invulnerable mons (#7986) 2025-10-20 13:38:01 +02:00
DizzyEggg
51de48fc3f
SetShellSideArmCategory avoid div by zero (#7980) 2025-10-19 20:40:34 +02:00
Alex
cb0d503f66
Decouple passive hp updates from move damage updates (#7942) 2025-10-19 16:40:13 +02:00
PhallenTree
38221b9de5
Fixes Shields Down incorrectly preventing status on Minior Core form (#7968) 2025-10-17 20:40:37 +02:00
spindrift64
de3c031fc5
Fix Anticipation type effectiveness check (#7840) 2025-10-16 14:36:07 +02:00
AlexOn1ine
e365add4cf 15/10/25 Master to upcoming merge 2025-10-15 21:31:00 +02:00
Alex
a77f8d97a1
Optimize GetWhichBattlerFasterOrTies (#7953) 2025-10-15 15:08:16 +02:00
Alex
3ad78d0079
Clean up follow up for AtkCanceller refactor (#7951) 2025-10-14 18:07:56 +01:00
PhallenTree
78b11bb35f
Fixes Cursed Body failing to disable moves on the last PP (#7940) 2025-10-13 13:55:39 +02:00
Alex
eee546df06
Item battle effect refactor (#7857) 2025-10-12 08:59:33 +02:00
Alex
798bf0a322
Removes a few redundant hitmarkers (#7915) 2025-10-11 15:03:23 +02:00
ghoulslash
77ec4cd6eb
Fix palaceUnableToUseMove falling through to change battle script (#7912)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-10-10 20:30:49 +02:00
AlexOn1ine
870b93aad9 06/10/25 Master to upcoming merge 2025-10-06 19:42:42 +02:00
Bassoonian
168e421033
Remove two unused bits from battle structs (#7835) 2025-10-02 15:54:46 +02:00
Eduardo Quezada
13f392987a
Fix some failed and assume fail tests with GEN_LATEST = GEN_5 (#7735) 2025-10-02 13:27:06 +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
Alex
42c990ed29
Fixes encore random target for gen5+ (#7800) 2025-09-30 17:50:22 +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
bd1a4db380
Fixes EndTurn Eject Pack (#7813) 2025-09-29 11:49:09 +02:00
Alex
b2c5a82003
Add func GetChosenMoveFromPosition (#7810) 2025-09-27 18:25:57 -04:00
AlexOn1ine
a4470cac2c Master to upcoming merge 2025-09-27 22:42:53 +02:00