2275 Commits

Author SHA1 Message Date
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
PhallenTree
9fde188033
Expand usage of FaintedActions enum in HandleFaintedMonActions (#8346) 2025-11-25 18:04:30 +01:00
Alex
c2fba193a6
Fix Upper Hand failure still activating Protean (#8329) 2025-11-23 12:36:28 +01:00
Alex
370a947cea
Documentation clean up for MoveCanceler (#8297) 2025-11-22 22:17:04 +01:00
AlexOn1ine
aa20b2bc0f master to upcoming merge 2025-11-22 10:39:52 +01:00
PhallenTree
65a5d1e7d8
Fixes Neutralizing Gas displaying message when exiting with multiple users (#8318) 2025-11-21 19:58:02 +01:00
moostoet
32b4897747
Fix Shed Shell allowing fleeing/teleporting and Smoke Ball failing to guarantee escape (#8286) 2025-11-20 22:30:29 +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
Martin Griffin
555c603b67
Avoid illegal move retargeting in singles (#8217) 2025-11-13 13:51:35 +01:00
Alex
ea442bca6d
Revert gBattleTurnCounter change (#8197) 2025-11-13 11:25:02 +01:00
Martin Griffin
30f6f1f8c1
HandleAction_UseMove minor cleanup (#8214) 2025-11-12 22:54:34 +01:00
Eduardo Quezada
1545e22d0a
Clean usage of gMovesInfo (#8234) 2025-11-12 19:29:45 +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
FosterProgramming
43f9a78da5
Fix recharge moves + add recharge move tests (#8181) 2025-11-09 17:46:22 +01:00
grintoul1
c230e54678 Master to Upcoming merge 20251107 2025-11-07 22:45:57 +00:00
Alex
0f14a4db57
Clean up ability effect hitmarker (#8138) 2025-11-04 21:44:57 +00:00
Alex
41aba41838
Attackstring hitmarker clean up (#8136) 2025-11-04 18:35:48 +00:00
Alex
80b5d81a9a
Create BattleStruct sub struct for event states (#8131) 2025-11-04 18:34:54 +00:00
Alex
be5f6d4801
Fixes hacky SetMoveEffect script calls (#7987) 2025-11-04 17:47:35 +00:00
Alex
499986a804
Clean up redundant todo (#8094) 2025-11-03 15:02:36 +01: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