Eduardo Quezada
|
8de86ba243
|
Fixed Belly Drum/Contrary interaction at max Attack (#8078)
|
2025-10-30 17:14:07 +01:00 |
|
Alex
|
c77c624e9f
|
Fixes Gooey/Tangling Hair ability pop up triggering on Clear Body (#8083)
|
2025-10-30 16:14:03 +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 |
|
Alex
|
dd875b87bc
|
Combine Simple Beam and Worry Seed into one effect (#8039)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-10-29 15:20:12 +01:00 |
|
Alex
|
ea60c32fbe
|
Fixes Liquid Ooze dmg not blocked by Magic Guard (#8036)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-29 15:19:50 +01:00 |
|
FosterProgramming
|
fd07daf0d8
|
Fix nature power string and add support for evnvironment in tests (#8068)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-28 19:23:16 +01:00 |
|
PhallenTree
|
782c559a20
|
Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-10-26 22:41:16 +01:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
Alex
|
7ebb939cbc
|
Remove usage of gBattlerTarget for MirrorHerb/Opportunist (#8033)
|
2025-10-25 13:52:40 +02:00 |
|
Alex
|
eb1be34d47
|
Fix Salt Cure script (#8005)
|
2025-10-24 18:53:53 +02:00 |
|
FosterProgramming
|
8c87522415
|
Fix toxic debris setting hazards on the wrong side when hit by an ally (#8026)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2025-10-24 11:50:19 +02:00 |
|
Alex
|
786859b6bb
|
Fix Fling Mental Herb message (#7984)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-10-19 22:38:27 +02:00 |
|
Alex
|
cb0d503f66
|
Decouple passive hp updates from move damage updates (#7942)
CI / build (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2025-10-19 16:40:13 +02:00 |
|
PhallenTree
|
38221b9de5
|
Fixes Shields Down incorrectly preventing status on Minior Core form (#7968)
|
2025-10-17 20:40:37 +02:00 |
|
FosterProgramming
|
864377f99a
|
Fix Cherim and Castfrom not reverting to baseform when Teraform Zero is triggered (#7961)
|
2025-10-16 19:19:31 +02:00 |
|
AlexOn1ine
|
e365add4cf
|
15/10/25 Master to upcoming merge
|
2025-10-15 21:31:00 +02:00 |
|
Alex
|
2daa8f3c88
|
Remove EffectHitSetTerrain script to use moveeffect (#7938)
|
2025-10-13 15:39:10 +02:00 |
|
FosterProgramming
|
daf642fdbf
|
Fix multiple battle arena bugs (#7941)
|
2025-10-13 13:12:50 +02:00 |
|
Alex
|
eee546df06
|
Item battle effect refactor (#7857)
|
2025-10-12 08:59:33 +02:00 |
|
Alex
|
798bf0a322
|
Removes a few redundant hitmarkers (#7915)
|
2025-10-11 15:03:23 +02:00 |
|
PhallenTree
|
4d12c35eb3
|
Fixes Steadfast not activating + tests (#7886)
|
2025-10-08 16:01:29 +02:00 |
|
AlexOn1ine
|
870b93aad9
|
06/10/25 Master to upcoming merge
|
2025-10-06 19:42:42 +02:00 |
|
Bassoonian
|
6267cef403
|
Streamline tryheal macros (#7830)
|
2025-10-01 13:45:20 +02:00 |
|
Alex
|
3ea095a941
|
More White Herb fixes/clean up (#7826)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-30 21:16:02 +02:00 |
|
spindrift64
|
2231b2fdca
|
Immunity abilities trigger on turn 0 (leads) (#7814)
|
2025-09-30 19:07:23 +02:00 |
|
Alex
|
ac75fe04d8
|
Fix test exit prints for stored battlers (#7807)
|
2025-09-28 14:47:22 -04:00 |
|
Alex
|
e9911d4d19
|
Fixes inaccurate save / restore in Fling script (#7811)
|
2025-09-28 17:39:08 +02:00 |
|
AlexOn1ine
|
a4470cac2c
|
Master to upcoming merge
|
2025-09-27 22:42:53 +02:00 |
|
Alex
|
3c9f05b367
|
Fixes activation order for a couple abilities (#7732)
|
2025-09-27 18:47:10 +02:00 |
|
Bassoonian
|
512471268e
|
Fix Salt Cure in double battles (#7797)
|
2025-09-25 16:59:39 +02:00 |
|
Alex
|
68e2bb5ab5
|
Fixes Leppa Berry timings (#7787)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-25 10:41:27 +02:00 |
|
hedara90
|
27b542466f
|
Fix Flame Burst timeout if primary target is fainted (#7793)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-09-25 10:39:56 +02:00 |
|
Alex
|
b244740f52
|
Fixes OHKO moves calculating accuracy twice (#7785)
|
2025-09-24 13:34:08 +02:00 |
|
Alex
|
2c16f6ba55
|
Fixes Flower Shield affecting semi-invulnerable mons (#7766)
|
2025-09-22 15:57:11 +02:00 |
|
Alex
|
e92598e9e8
|
Fix up end turn scripts plus small documentation (#7758)
|
2025-09-19 20:07:24 +02:00 |
|
AlexOn1ine
|
bc84e6656d
|
Master to upcoming merge
|
2025-09-17 20:18:51 +02:00 |
|
Alex
|
f671b130a6
|
Fixes Beat Up incorrect slots usage (#7741)
|
2025-09-17 11:40:40 +02:00 |
|
Alex
|
74de29a921
|
Bugfixes Batch (#7739)
|
2025-09-16 19:44:06 +02:00 |
|
Alex
|
32f8464fec
|
Attackcanceller fixes and improvements (#7698)
|
2025-09-16 18:00:30 +02:00 |
|
Eduardo Quezada
|
deaf77f619
|
Fix most failed and assume fail tests with GEN_LATEST = GEN_6 (#7696)
|
2025-09-14 20:21:38 +02:00 |
|
Alex
|
78a05c97ac
|
Refactors ruin ability checks into a field effect (#7711)
|
2025-09-14 14:41:10 +01:00 |
|
Alex
|
2f22780c17
|
Fixes Uproar not waking up mons (#7714)
|
2025-09-12 17:42:41 +02:00 |
|
Alex
|
ffd71b5337
|
Fixes incorrect ending for some scripts (#7691)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-10 22:16:47 +02:00 |
|
Alex
|
05ed9f0d39
|
Remove Uproar attack battle script (#7715)
|
2025-09-10 22:07:43 +02:00 |
|
PhallenTree
|
827dd4a67c
|
Fixes Intrepid Sword/Dauntless Shield boosting after entering while at max stats (#7716)
|
2025-09-10 16:38:09 +02:00 |
|
Alex
|
7a0e5046d1
|
Fixes Rage Fist for gen7 Disguise (#7692)
|
2025-09-08 11:56:31 +02:00 |
|
Alex
|
92ba0d813d
|
Fixes Sweet Veil not protecting sleep from Yawn status (#7704)
|
2025-09-08 11:51:22 +02:00 |
|
PhallenTree
|
8486e0e045
|
Fixes Weak Armor and items not displaying stat change attributes (#7701)
|
2025-09-07 20:30:00 +02:00 |
|
Hedara
|
1ec08fbe0d
|
Merge branch 'master' into master-to-upcoming
|
2025-09-06 19:43:43 +02:00 |
|
Alex
|
0422340356
|
Refactors Attackstring and PP deduction (#7402)
|
2025-09-03 20:25:27 +02:00 |
|
Eduardo Quezada
|
1e6a533131
|
Fix most failed tests with GEN_LATEST = GEN_7 (#7688)
|
2025-09-03 19:23:23 +02:00 |
|
Eduardo Quezada
|
5344d1ec63
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages
|
2025-08-28 16:50:18 -04:00 |
|
AlexOn1ine
|
1131b205f2
|
conflicts
|
2025-08-28 14:09:38 +02:00 |
|
Alex
|
a45d36d90f
|
The original attacker wasn't restored for Doodle (#7620)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-08-26 22:16:57 +02:00 |
|
AlexOn1ine
|
ce52d83343
|
25/08/25 Master merge
|
2025-08-25 17:30:38 +02:00 |
|
Alex
|
6df3a48ca2
|
Fixes octolock not ending after user switched out (#7556)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-08-25 15:46:36 +02:00 |
|
Hedara
|
da77dba59f
|
Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
data/battle_scripts_1.s
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
|
2025-08-21 15:40:38 +02:00 |
|
hedara90
|
95eb3ba1a7
|
Fix B_ANIMATE_MON_AFTER_KO with a new counter (#7531)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2025-08-21 14:43:41 +02:00 |
|
Alex
|
208f97e1e3
|
Rename passive damage hitmarker (#2174)
|
2025-08-21 13:43:19 +01:00 |
|
RavePossum
|
2d9dc28b7a
|
Fix in-game partner battles always causing a whiteout (#7587)
|
2025-08-21 12:44:15 +02:00 |
|
PhallenTree
|
c6ee7feaa3
|
Fixes some Ability Shield interactions (#7532)
|
2025-08-12 15:45:02 +02:00 |
|
ghoulslash
|
18363207d9
|
Fix Mimicry Only Activating Once per Turn (#7537)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-08-12 15:40:10 +02:00 |
|
Alex
|
f4c91b5539
|
Convert statuses3 to volatiles (#7514)
|
2025-08-11 23:19:36 +02:00 |
|
Eduardo Quezada
|
b501fe7354
|
Removed B_ABILITY_POP_UP
|
2025-08-11 13:41:32 -04:00 |
|
Eduardo Quezada
|
d2acc2d7d6
|
Changed instances of "But it failed" to "It doesn't affect X"
|
2025-08-11 13:33:56 -04:00 |
|
Eduardo Quezada
|
db0ca2ce49
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages
|
2025-08-11 12:39:28 -04:00 |
|
Eduardo Quezada
|
a9d5c2cd28
|
Updated Dream Eater/Liquid Ooze's interaction to Gen 5 standards (#7528)
|
2025-08-11 16:06:58 +02:00 |
|
AlexOn1ine
|
bd919e3219
|
11/08/25 Master to upcoming merge
|
2025-08-11 08:31:12 +02:00 |
|
Eduardo Quezada
|
c87d3b1769
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/messages
|
2025-08-10 21:29:01 -04:00 |
|
Alex
|
acc82e7d79
|
Convert Status4 to volatiles (#7411)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-08-05 19:28:33 +02:00 |
|
AlexOn1ine
|
54ffc6bf08
|
Fixes Leech Seed recovery not applying behind Sub
|
2025-08-03 21:59:48 +02:00 |
|
Alex
|
ed44da8644
|
Add a heal animation to Hospitality recovery (#7426)
|
2025-08-02 11:56:00 +01:00 |
|
AlexOn1ine
|
bc73f4654b
|
merge master 31/07/25
|
2025-08-01 12:18:11 +02:00 |
|
PhallenTree
|
01105171a3
|
Fixes Magnet Rise when user is Rooted/Smacked Down (#7449)
|
2025-07-31 19:30:50 +02:00 |
|
PhallenTree
|
8bfc5b3093
|
Fixes Razor Wind not activating after hit effects after the first target (#7413)
|
2025-07-28 14:21:12 +02:00 |
|
Alex
|
38964e4f0a
|
Fixes Wandering Spirit overwriting battlers (#7407)
|
2025-07-25 13:26:12 -04:00 |
|
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 |
|
Eduardo Quezada
|
57da4617da
|
Ability status immunity
|
2025-06-26 17:44:29 -04: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 |
|
Vex
|
7b686b6749
|
Fix Wish healing even if the target is Heal Blocked (#6979)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-05-25 23:01:11 +02:00 |
|
Eduardo Quezada
|
9554146738
|
Fixed forfeit money for B_WHITEOUT_MONEY <= GEN_3 (#6942)
|
2025-05-22 14:27:28 +02:00 |
|
Bassoonian
|
54806c8838
|
Add no-whiteout feature (#6795)
|
2025-05-17 11:20:35 +02:00 |
|
AlexOn1ine
|
35dff24c9b
|
Master to upcoming merge
|
2025-05-15 20:37:27 +02:00 |
|
Alex
|
a086d5f592
|
Reverts wrongly done gem fix and renames struggle effect (#6806)
|
2025-05-15 10:45:48 +02:00 |
|
Alex
|
75cd16dae0
|
Fix potential bug in BattleScript_FriskActivates (#6850)
|
2025-05-15 10:44:37 +02:00 |
|
Jonathan Lin
|
b5fbced691
|
New animations for Mega Evolution, Primal Reversion, Ultra Burst, and Power Construct (#6834)
|
2025-05-15 09:40:02 +02:00 |
|
Eduardo Quezada
|
3ef61e6451
|
Combined type-enhancing hold effects (#6846)
|
2025-05-14 13:45:08 +02:00 |
|
ghoulslash
|
d4c64d3b67
|
rename berrystatraise script to consumablestatraise
|
2025-05-12 21:11:25 -04:00 |
|
ghoulslash
|
14a66d612f
|
combine BattleScript_BerryStatRaiseRet and BattleScript_BerryStatRaiseEnd2, check ripen popup doesn't trigger except on berries
|
2025-05-12 21:06:12 -04:00 |
|
Hedara
|
1abfa7acfa
|
Merge branch 'master' into master-upcoming
Conflicts:
include/battle.h
include/constants/battle_string_ids.h
src/battle_ai_util.c
src/battle_main.c
src/battle_util.c
test/battle/ai/ai.c
|
2025-05-12 18:21:35 +02:00 |
|
PhallenTree
|
a6b02b00c0
|
Fixes restoretarget on empty stack when using G-Max Gravitas (#6827)
|
2025-05-12 15:16:40 +02:00 |
|
Alex
|
d00563d830
|
Changed White Herb hold effect name (#6815)
|
2025-05-11 11:34:47 +02:00 |
|
Alex
|
0ad3f929ab
|
Fixes Berserk Gene infinite loop (#6813)
|
2025-05-11 11:34:16 +02:00 |
|
spindrift64
|
f4f82f2394
|
Toxic Spikes print whether the target is poisoned or badly poisoned (#6814)
|
2025-05-10 22:55:28 +02:00 |
|
Alex
|
4342bfb91d
|
Refactor stockpile resets (#6810)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-05-10 20:09:38 +02:00 |
|
PhallenTree
|
48c08c0368
|
Illusion struct cleanup and many Illusion fixes (#6798)
|
2025-05-09 20:41:20 +02:00 |
|
Alex
|
6fe5f6530a
|
General MoveEnd clean up and Fell Stinger adjustments (#6674)
|
2025-05-07 00:30:43 +02:00 |
|
AlexOn1ine
|
40bf9ae087
|
conflicts
|
2025-05-03 10:26:07 +02:00 |
|
Alex
|
9259b7ee69
|
Bugfixes batch (#6750)
|
2025-05-02 20:14:27 +02:00 |
|
Alex
|
4ff2f3de42
|
Centralizes non volatile status effect checks (#6533)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-04-30 11:34:19 -04:00 |
|
Hedara
|
0eeba00d1b
|
Merge branch 'master' into master-upcoming-2025-04-30
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
|
2025-04-30 15:22:37 +02:00 |
|
Hedara
|
4873589c65
|
Merge remote-tracking branch 'pret/master' into new-pret-merge
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
|
2025-04-29 20:27:33 +02:00 |
|