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 |
|
surskitty
|
3ee93c69ec
|
Preliminary handling for AI_FLAG_ASSUME_POWERFUL_STATUS, not actually yet called.
|
2025-07-10 23:38:08 -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 |
|
Jared Schoeny
|
b18de9d182
|
Add making release build
|
2025-07-07 10:24:45 -10: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
|
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 |
|
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 |
|
Alex
|
10e55bd18d
|
Fixes Life Dew playing anim when it is not supposed to + tests (#7239)
|
2025-07-01 17:49:31 +02:00 |
|
Alex
|
89b1a45536
|
Fixes Ice Spinner and Steel Roller (#7259)
|
2025-07-01 15:39:22 +01:00 |
|
Eduardo Quezada
|
7a0cbc12d2
|
Added CRY_MODE_DYNAMAX (#6933)
|
2025-06-30 09:45:09 -07:00 |
|
GriffinR
|
0c7c81e02f
|
Merge branch 'master' into _pret/pr/pyramidLocation
|
2025-06-30 11:51:45 -04: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 |
|
Eduardo Quezada
|
57da4617da
|
Ability status immunity
|
2025-06-26 17:44:29 -04:00 |
|
Eduardo Quezada
|
cf85abc270
|
Remove unused messages
|
2025-06-26 16:42:12 -04: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
|
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 |
|
Alex
|
f8551830c9
|
Adds Gen5+ Encore config (#7051)
|
2025-06-25 15:58:30 +02:00 |
|
Ariel A
|
7564262543
|
Merge branch 'followers' into lighting
|
2025-06-24 20:44:44 -04:00 |
|
Ariel A
|
685a8a9118
|
Merge remote-tracking branch 'upstream/master' into followers
|
2025-06-24 20:39:12 -04:00 |
|
Ariel A
|
1f2fe7396b
|
feat: added abnormal weather follower message
Includes support for follower matching != species
|
2025-06-24 20:19:23 -04:00 |
|
Alex
|
66e8200d95
|
Use battler arguments for SetMoveEffect (#7156)
|
2025-06-23 15:26:31 +02:00 |
|
AlexOn1ine
|
aabb632894
|
Master to upcoming merge, 20/06/25
|
2025-06-20 17:09:58 +02:00 |
|
Eduardo Quezada
|
8a0bc495d5
|
Fixed description of FORM_CHANGE_WITHDRAW (#7152)
|
2025-06-18 22:09:59 +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 |
|
Eduardo Quezada
|
800829538c
|
Compound strings for hold effect names (#7140)
|
2025-06-18 11:38:42 +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 |
|
Alex
|
e2f0767be5
|
Decouple Status set by ability from SetMoveEffect (#7125)
|
2025-06-16 14:45:21 +01:00 |
|
cawtds
|
3491cd95e8
|
Fix sell price display (#7123)
|
2025-06-15 11:52:51 +02:00 |
|
Alex
|
c6b4118c3c
|
Added AI_FLAG_PP_STALL_PREVENTION to AI_FLAG_SMART_TRAINER (#7112)
|
2025-06-14 11:06:23 +02:00 |
|
Hedara
|
bdd7c5bfa8
|
Merge branch 'master' into master-merge
Conflicts:
src/contest_painting.c
|
2025-06-09 23:27:18 +02:00 |
|
kittenchilly
|
872bb8785b
|
Simplify white out messages (#6961)
|
2025-06-08 08:52:37 -07:00 |
|