AlexOn1ine
|
90eef35715
|
master merge
|
2025-07-19 17:01:18 +02:00 |
|
Alex
|
71d40cc3f1
|
Convert various to callnatives (#7355)
|
2025-07-18 19:12:37 +02:00 |
|
Alex
|
705f194d98
|
Fixes various battler corruption during switch in ability activation (#7352)
|
2025-07-18 12:28:00 +02:00 |
|
AERDU
|
da3d223c45
|
fallback bugfix for B_DARK_VOID_FAIL < GEN_7 (#7351)
|
2025-07-16 12:41:32 +02: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 |
|
ghoulslash
|
c7b2c771e1
|
Cotton down use jumpifabsent (#7318)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-07-11 09:43:14 +02:00 |
|
mudskipper13
|
0d09e5cce8
|
battle_interface: overhaul ability pop up (#7227)
|
2025-07-10 19:09:52 +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 |
|
PhallenTree
|
38a3963ec2
|
Fix Psych Up message and cleanup and don't allow switching to self in tests (#7277)
|
2025-07-05 14:47: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
|
c27cc2ed70
|
Script clean up for Flame Burst and Costar (#7264)
|
2025-07-02 09:16:05 +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
|
89b1a45536
|
Fixes Ice Spinner and Steel Roller (#7259)
|
2025-07-01 15:39:22 +01:00 |
|
Alex
|
5451e40830
|
Fixes Toxic Thread animation not being played at the right time (#7247)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-06-30 21:41:29 +02:00 |
|
ghoulslash
|
21ac62f781
|
Flush textbox for Truant Popup (#7252)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-06-29 21:38:52 +02:00 |
|
PhallenTree
|
6ed4f73f6a
|
Fixes Emergency Exit sometimes causing an unrelated battler to become invisible (#7241)
|
2025-06-28 23:20:40 +02:00 |
|
psf
|
b60c897b4a
|
Add P_ASK_MOVE_CONFIRMATION (#7132)
|
2025-06-27 10:11:41 +02:00 |
|
PhallenTree
|
a82aa618fb
|
Adds Ability Shield activation message (#7224)
|
2025-06-26 14:42:32 +02:00 |
|
Alex
|
2531613a52
|
Fixes Eject Pack not resolving correctly during switch in effects (#7002)
|
2025-06-25 21:15:40 +02:00 |
|
Alex
|
773ecd4c24
|
Fixes OOB for Teatime and Flower Shield (#7214)
|
2025-06-25 21:00:49 +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 |
|
Alex
|
f8551830c9
|
Adds Gen5+ Encore config (#7051)
|
2025-06-25 15:58:30 +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 |
|
Alex
|
66e8200d95
|
Use battler arguments for SetMoveEffect (#7156)
|
2025-06-23 15:26:31 +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 |
|
Alex
|
57feee3743
|
Add missing flag for Berserk Gene (#7151)
|
2025-06-19 14:26:28 +02:00 |
|
PhallenTree
|
340d815c6d
|
Stat Change (Animation) Refactor (#7144)
|
2025-06-18 14:24:35 +02:00 |
|
Nephrite
|
06cd3af3ea
|
Volatile status refactoring (#6983)
|
2025-06-18 07:22:41 +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 |
|
Alex
|
c120fa71dc
|
Fixes Ally Switch in multi battles (#7109)
|
2025-06-13 15:18:27 +02:00 |
|
PhallenTree
|
a000a743df
|
Fix typos and some cleanup (mainly in battle files) (#7107)
|
2025-06-13 14:12:13 +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 |
|
Alex
|
f374291f69
|
Fixes Wandering Spirit copied ability activation on fainted mon (#7066)
|
2025-06-05 22:47:32 +02:00 |
|
Alex
|
020be9d5b0
|
Deprecate sStatusFlagsForMoveEffects (#7063)
|
2025-06-05 14:32:28 +02:00 |
|
Alex
|
177fa2f096
|
Combines Super Fang and Guardian of Alola effects (#7048)
|
2025-06-03 10:26:25 +02:00 |
|
Alex
|
ede15918cf
|
Refactors Final Gambit + Tests (#7005)
|
2025-05-31 15:52:53 +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 |
|
AlexOn1ine
|
f4c64a2d79
|
conflicts
|
2025-05-30 19:20:32 +02:00 |
|
Alex
|
5bdab5163e
|
Update Supersweet Syrup with eject pack fix (#7015)
|
2025-05-30 11:58:32 +02:00 |
|
Alex
|
c489d36fc6
|
Fixes Gen3 berry activation timing (#6993)
|
2025-05-27 23:36:00 +02:00 |
|
Alex
|
de463af0df
|
Fixes weather anim damage being applied to the wrong mon (#6973)
|
2025-05-26 13:22:05 +02:00 |
|
AlexOn1ine
|
b90fdd1b3c
|
Master to upcoming merge
|
2025-05-26 10:41:11 +02:00 |
|