2418 Commits

Author SHA1 Message Date
Alex
10e55bd18d
Fixes Life Dew playing anim when it is not supposed to + tests (#7239) 2025-07-01 17:49:31 +02:00
Alex
d1577d96ad
Set correct Instruction in Cmd_setnonvolatilestatus (#7236) 2025-06-27 18:37:24 +01:00
i0brendan0
206d2503d8
Add Gen 2 Moonlight, Morning Sun, Synthesis configuration (#7209)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-26 21:00:02 +02:00
Alex
ed59b2fb0e
Remove redundant move result flag checks (#7223) 2025-06-26 16:08:12 +02:00
PhallenTree
a82aa618fb
Adds Ability Shield activation message (#7224) 2025-06-26 14:42:32 +02:00
Alex
6824e7d175
Attackcanceller clean up (#7210) 2025-06-25 21:36:15 +02:00
Alex
2531613a52
Fixes Eject Pack not resolving correctly during switch in effects (#7002) 2025-06-25 21:15:40 +02:00
Alex
7d7ffd58ae
Fixes Booster Energy timing activation + Clean up (#7175)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-06-25 18:20:55 +02:00
Hedara
51a5577f65 Merge branch 'master' into master-upcoming
Conflicts:
	src/battle_controller_safari.c
	src/data/moves_info.h
	src/graphics.c
2025-06-25 14:17:07 +02:00
cawtds
59350cc32f
Increase party action limit (#7119) 2025-06-24 15:15:04 +02:00
Alex
66e8200d95
Use battler arguments for SetMoveEffect (#7156) 2025-06-23 15:26:31 +02:00
Bassoonian
c34ec8956d
Master to upcoming merge, 20/06/25 (#7169) 2025-06-23 10:04:44 +02:00
Eduardo Quezada
bca28b40bb
Use argument.type for EFFECT_SOAK (#7141) 2025-06-21 00:04:52 +02:00
PhallenTree
98670ca30e
Fixes Neutralizing Gas leaving the field activating unsuppressable abilities again (#7170) 2025-06-21 00:04:01 +02:00
AlexOn1ine
aabb632894 Master to upcoming merge, 20/06/25 2025-06-20 17:09:58 +02:00
Bassoonian
6333702461
Converts more defines to enums and name unnamed enums (#7071)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-06-18 14:30:37 +02:00
PhallenTree
340d815c6d
Stat Change (Animation) Refactor (#7144) 2025-06-18 14:24:35 +02:00
Alex
ab1838ffd8
Repurposes IsMagicGuardProtected into a general function (#7114) 2025-06-18 12:56:03 +02:00
Nephrite
a18709fb47
Bag refactor (groundwork for expansion) (#7018) 2025-06-18 10:59:24 +02:00
Nephrite
06cd3af3ea
Volatile status refactoring (#6983) 2025-06-18 07:22:41 +02:00
Eduardo Quezada
5966852f8d
Removed Mind Blown effect in favor of move flag (#7138) 2025-06-17 00:02:46 +02:00
Eduardo Quezada
651e87af5f
Converted Relic Song into a proper form change (#7139) 2025-06-17 00:02:25 +02:00
Eduardo Quezada
221ff8ed47
Removed redundant Damp check (#7134) 2025-06-16 22:11:00 +02:00
Alex
e2f0767be5
Decouple Status set by ability from SetMoveEffect (#7125) 2025-06-16 14:45:21 +01:00
Alex
d4146afcae
Add damage context to effectiveness multiplier (#7111) 2025-06-14 11:05:14 +02:00
Alex
c120fa71dc
Fixes Ally Switch in multi battles (#7109) 2025-06-13 15:18:27 +02:00
Alex
e1b542944f
Refactor damage calculations aruguments by using a struct context (#7108) 2025-06-13 14:16:40 +02:00
PhallenTree
a000a743df
Fix typos and some cleanup (mainly in battle files) (#7107) 2025-06-13 14:12:13 +02:00
Alex
aa78420b9e
Deprecate absent member from battlerState (#7091) 2025-06-12 10:41:46 +02:00
Hedara
bdd7c5bfa8 Merge branch 'master' into master-merge
Conflicts:
	src/contest_painting.c
2025-06-09 23:27:18 +02:00
PhallenTree
28d185be95
Fixes Pursuit potentially causing both battlers to switch into the same mon (#7084) 2025-06-07 23:59:44 +02:00
Alex
9f1eb78737
Fixes freeze during a 1v2 double battle (#7075) 2025-06-07 11:49:15 +02:00
Linathan
dc279f14ba
Chloroblast fix (#7008) 2025-06-06 21:33:56 +02:00
Alex
020be9d5b0
Deprecate sStatusFlagsForMoveEffects (#7063) 2025-06-05 14:32:28 +02:00
Eduardo Quezada
d795de9e9d
Remove more instances of hard-coded Move IDs (#7056) 2025-06-03 23:26:48 +02:00
Bassoonian
1a6ed20713
Add dedicated getter functions for Pokémon types and abilities (#7043) 2025-06-03 22:05:22 +02:00
Alex
177fa2f096
Combines Super Fang and Guardian of Alola effects (#7048) 2025-06-03 10:26:25 +02:00
Bassoonian
c5c7bb13c9
Converts a bunch of defines to enums (#7041) 2025-06-02 15:54:37 +02:00
Eduardo Quezada
5502fe2c5e
GetBattlerMon cleanup (#6967) 2025-06-01 21:10:24 +02:00
hedara90
0917af214c
Replace all usages of lz compression with smol (#7032)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-31 19:47:54 +02:00
Alex
ede15918cf
Refactors Final Gambit + Tests (#7005) 2025-05-31 15:52:53 +02:00
Alex
eb81820ae3
Clean up battlescript calls with func BattleScriptCall (#6873) 2025-05-31 09:09:35 +02:00
PhallenTree
fa342b2909
Fixes Defiant/Competitive not resetting stat change animations and stat change related cleanup (#7004) 2025-05-31 08:45:46 +02:00
Hedara
9d80ad530d Merge branch 'master' into master-to-upcoming
Conflicts:
	Makefile
	data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
	data/maps/MtChimney/scripts.inc
	data/maps/MtPyre_Summit/scripts.inc
	data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
	include/constants/event_objects.h
	include/constants/expansion.h
	src/battle_script_commands.c
	src/battle_util.c
	src/field_screen_effect.c
2025-05-28 14:26:15 +02:00
Vex
ecb20b2a25
Fix Eiscue not resetting back to Ice Face form after battle. (#6997) 2025-05-28 12:43:38 +02:00
Alex
c489d36fc6
Fixes Gen3 berry activation timing (#6993) 2025-05-27 23:36:00 +02:00
malad1211
d27a3575f2
Cleanup identical if blocks (#6988) 2025-05-27 10:12:12 +02:00
Alex
983f8e34a1
Fixes repeated learning of level up moves (#6981) 2025-05-26 14:15:16 -07:00
AlexOn1ine
b90fdd1b3c Master to upcoming merge 2025-05-26 10:41:11 +02:00
Bassoonian
812bde8a48
Pret merge (24th of May, 2025) (#6978) 2025-05-25 23:08:37 +02:00