7464 Commits

Author SHA1 Message Date
Pawkkie
bad2307497
Instant Win option in Battle Debug (#7333) 2025-07-13 11:40:21 -04:00
AlexOn1ine
165e7502bc Instant Win option in Battle Debug 2025-07-13 16:21:37 +02:00
hedara90
14dbbf63d4
Remove competitive syntax config (#7154)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-07-12 13:03:36 -07:00
Frank DeBlasio
c9ec896312
Refactor battle environment (#4891) 2025-07-12 12:38:06 -04:00
AlexOn1ine
68db4c5a77 12/07/25 master to upcoming merge 2025-07-12 11:55:06 +02:00
Nephrite
a1e67572b6
Replaces STATUS2 usage with volatiles in code (#7262)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-11 22:53:49 +02:00
Linathan
9228826ae1
New and polished battle animations (#7074) 2025-07-11 19:14:19 +02:00
Nephrite
7d5a949b71
Bag refactor 2 (#7166) 2025-07-11 11:50:38 +02:00
grintoul
d63f859db6
Multibattles Illusion party boundaries fix (#7308) 2025-07-11 09:53:03 +02:00
surskitty
424c127b8b
AI Tests + accompanying bugfixes for Skill Swap, Worry Seed, weather setting in double battles, and Discharging into an ally's lightningrod (#7297) 2025-07-10 16:08:14 -04:00
surskitty
cb03086c1d
AI checks the partner's moves for Flatter, Swagger, and Soak. (#7306) 2025-07-10 20:02:31 +02:00
Pawkkie
419219bb31
Add AI_FLAG_ASSUME_STAB (#6797) 2025-07-10 19:58:31 +02:00
mudskipper13
0d09e5cce8
battle_interface: overhaul ability pop up (#7227) 2025-07-10 19:09:52 +02:00
Pawkkie
e4d9298200
Fix move comparison scoring (#7301) 2025-07-10 09:51:46 +02:00
surskitty
95a02dddb9
Improved logic for Guard Split and Power Split. (#7298) 2025-07-09 18:11:39 -04:00
Alex
d15c490223
Changes AccuracyCalcHelper into CanMoveSkipAccuracyCalc (#7303) 2025-07-09 17:33:48 -04:00
Martin Griffin
f4cc802656
Fix crashing tests looping (#7299) 2025-07-09 09:02:55 +02:00
khbsd
57dad22ac4
feat: separate water and rock smash encounter rate checks (#7293) 2025-07-08 20:52:42 +02:00
Alex
31a561201b
Adds hazard queue (#7295) 2025-07-07 15:30:35 -04:00
Alex
7ae97ab6e9
Refactor move Synchronise (#7271) 2025-07-07 13:36:21 -04:00
Alex
f808201945
Fixes Natural Gift moveend execution (#7274) 2025-07-05 15:05:35 -04:00
surskitty
4052ab337c
Expanding and Refactoring Skill Swap and other ability-changing moves (#7238)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-07-05 14:49:35 +02:00
surskitty
c360900a5b
Renaming STATUS1_REFRESH and adding more constants for common STATUS1 checks. (#7284) 2025-07-05 13:46:23 +02:00
Nephrite
e8abfbce49
Untangled TMs and HMs from item ids (#7173) 2025-07-04 19:07:53 +02:00
hedara90
56907bc26e
Merrp merge, 2025-06-25 (#7217) 2025-07-04 13:03:09 +02:00
surskitty
b3f52166df
Changing P_ONLY_OBTAINABLE_SHINIES to truly be Only Obtainable Shinies (#7275) 2025-07-04 11:06:36 +02:00
hedara90
ae1d99bb4f
Master to upcoming merge 01/07/25 (#7267) 2025-07-02 11:39:59 +02:00
AlexOn1ine
aa9ff53b81 master to upcoming merge 2025-07-02 10:05:31 +02:00
Alex
e503f97f32
Use dedicated functions for Mud/Water Sport (#7248) 2025-07-02 09:08:12 +02:00
cawtds
92b4b7f0a0
Keep removed headers (#7261) 2025-07-02 09:06:23 +02:00
Alex
be2d36b6ee
Fixes instances of battler mutation for abilities (#7250) 2025-07-01 19:48:12 +02:00
Alex
10e55bd18d
Fixes Life Dew playing anim when it is not supposed to + tests (#7239) 2025-07-01 17:49:31 +02:00
Alex
f8fc86275c
Fixes protective pads not protecting from secondary protect effects (#7229) 2025-07-01 17:48:57 +02:00
Alex
89b1a45536
Fixes Ice Spinner and Steel Roller (#7259) 2025-07-01 15:39:22 +01:00
mudskipper13
aae04ffc84
Improve trainer back pic-related data and code (+ smol documentation) (#6821) 2025-06-30 23:50:48 +02:00
Eduardo Quezada
7a0cbc12d2
Added CRY_MODE_DYNAMAX (#6933) 2025-06-30 09:45:09 -07:00
Hedara
947faa97d3 Start of 1.12.2 cycle 2025-06-30 11:01:46 +02:00
Hedara
1e281547ed 1.12.1 Release commit 2025-06-30 11:01:13 +02:00
Bivurnum
b1200117a9
Better system for Follower NPC running frames (#7222)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-06-27 10:12:35 +02:00
psf
b60c897b4a
Add P_ASK_MOVE_CONFIRMATION (#7132) 2025-06-27 10:11:41 +02: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
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
Bolt-Strike
f217344cb5
Disable unowned evo methods (#7103) 2025-06-25 21:29:59 +02:00
Alex
2531613a52
Fixes Eject Pack not resolving correctly during switch in effects (#7002) 2025-06-25 21:15:40 +02:00
Bivurnum
c6221fa50e
Add debug options for follower NPCs (#7215) 2025-06-25 21:13:43 +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
c0a50096f3 Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge
Conflicts:
	include/constants/event_objects.h
	src/event_object_movement.c
	src/follower_helper.c
2025-06-25 17:54:59 +02:00
Hedara
1916703e5a Merge commit '685a8a911878f54463845c9f2ebbf11bd04ff4ee' into merrp-merge
Conflicts:
	include/battle_script_commands.h
	include/constants/event_objects.h
	include/event_object_movement.h
	include/field_effect.h
	include/field_effect_helpers.h
	include/sprite.h
	src/battle_controller_player.c
	src/event_object_movement.c
	src/pokeball.c
2025-06-25 17:49:19 +02:00
Hedara
3ce34c41b6 Merge commit '1f2fe7396b68d82da356b93fca10cc5736d3159c' into merrp-merge
Conflicts:
	include/follower_helper.h
	src/follower_helper.c
2025-06-25 17:20:38 +02:00