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 |
|
FosterProgramming
|
db7e062fe1
|
Add some missing move animations to the move animation tests (#7507)
|
2025-09-21 23:27:05 +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 |
|
mudskipper13
|
59a214828e
|
Implement field_name_box (#7697)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-09-14 20:45:18 +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 |
|
grintoul
|
a2e1835993
|
Separates FRB and FRZ animations (#7611)
|
2025-08-28 19:07:08 +02: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 |
|
RavePossum
|
0a3c281cdd
|
Fix terastallization anims flickering (#7613)
|
2025-08-25 11:48:52 +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 |
|
AlexOn1ine
|
0eb715de11
|
Add rock climb history from ghoul
|
2025-08-05 20:47:05 +02: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 |
|
pokesidv
|
4d31693005
|
Rock climb by ghoulslash (#7432)
Co-authored-by: Evan <eroelke@gmail.com>
Co-authored-by: Jaizu <jaizu85@gmail.com>
Co-authored-by: ghoulslash <41651341+ghoulslash@users.noreply.github.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-08-03 14:52:07 +02:00 |
|
Alex
|
ed44da8644
|
Add a heal animation to Hospitality recovery (#7426)
|
2025-08-02 11:56:00 +01:00 |
|