Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
PhallenTree
|
5b738edd4b
|
Fixes flung items sometimes being blocked by Unnerve (#8114)
|
2025-11-02 20:31:51 +01:00 |
|
PhallenTree
|
f206746bfa
|
Fix test
|
2025-11-01 19:33:51 +00:00 |
|
PhallenTree
|
c9c0b79dcb
|
Assumes for the other moves
|
2025-11-01 19:02:27 +00:00 |
|
PhallenTree
|
e62be0b3a9
|
Fixes Sticky Barb never getting transferred to attacker + tests
|
2025-11-01 19:01:18 +00:00 |
|
grintoul
|
dba50c91ea
|
Aura Break tests (#8099)
|
2025-11-01 13:43:31 +01:00 |
|
AlexOn1ine
|
d4e7e7ad36
|
10/11/25 Master to upcoming merge
|
2025-11-01 11:54:17 +01:00 |
|
Eduardo Quezada
|
f66ba68eee
|
Fixed Zygarde Complete disappearing upon catch (#8089)
|
2025-10-31 19:41:46 +01:00 |
|
Alex
|
1c1a98ee45
|
Grudge, Destiny Bond and FaintBattler refactor (#8072)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-30 23:14:02 +01:00 |
|
Alex
|
3a3b947622
|
Fixes intimidate activating on empty field (#8058)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-10-30 17:51:57 +01:00 |
|
Eduardo Quezada
|
8de86ba243
|
Fixed Belly Drum/Contrary interaction at max Attack (#8078)
|
2025-10-30 17:14:07 +01:00 |
|
PhallenTree
|
9d06a4fb55
|
Emergency Exit on hazards activation + fix end of turn activation (#8075)
|
2025-10-30 17:01:13 +01:00 |
|
Alex
|
c77c624e9f
|
Fixes Gooey/Tangling Hair ability pop up triggering on Clear Body (#8083)
|
2025-10-30 16:14:03 +01:00 |
|
Eduardo Quezada
|
814cf53629
|
Fixed Hunger Switch changing forms on switch out while Tera'd (#8080)
|
2025-10-30 15:43:50 +01:00 |
|
Eduardo Quezada
|
9bfac0099e
|
Fixed fainting form change tests
|
2025-10-29 18:13:41 -03: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 |
|
PhallenTree
|
4a714225e5
|
Fixes hazards and switch-in items not being reset when switching in (#8074)
|
2025-10-29 14:25:05 +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 |
|
Bassoonian
|
f7cbe4853b
|
Add type enum (#8054)
|
2025-10-27 16:41:22 +00:00 |
|
PhallenTree
|
782c559a20
|
Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042)
|
2025-10-26 22:41:16 +01:00 |
|
FosterProgramming
|
6faf35dde9
|
Fix emergency exit not triggering properly during wild battles (#8037)
|
2025-10-26 22:35:27 +01:00 |
|
grintoul
|
3260d2a42a
|
Fixed test "Revival Blessing cannot revive a partner's party member" (#8031)
Co-authored-by: hedara90 <90hedara@gmail.com>
|
2025-10-26 11:43:54 +01:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
grintoul
|
271ca56bdb
|
Fixes CanUseLastResort and resolves 3 KNOWN_FAILING Last Resort tests (#8032)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-25 14:42:28 +02:00 |
|
Bassoonian
|
9fa6cd6a4c
|
Add test to detect save file shifting (#8030)
|
2025-10-25 14:38:58 +02:00 |
|
Bassoonian
|
be23dfdf2a
|
Even more enums and documentation (#8029)
|
2025-10-25 14:37:47 +02:00 |
|
Alex
|
8ea947d5a1
|
Fixes Protosynthesis not activating after weather was reset (#8021)
|
2025-10-24 18:53:34 +02:00 |
|
grintoul
|
95c2a6e2b6
|
Multibattle testing system (#7257)
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2025-10-24 15:00:23 +02:00 |
|
FosterProgramming
|
8c87522415
|
Fix toxic debris setting hazards on the wrong side when hit by an ally (#8026)
|
2025-10-24 11:50:19 +02:00 |
|
Bassoonian
|
fbd702e3a4
|
Some more documentation and cleanup (#8020)
|
2025-10-23 20:14:38 +02:00 |
|
FosterProgramming
|
5b4403ddfe
|
Fix stats defined in tests being overwritteng by stat change (#8018)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-23 18:59:15 +02:00 |
|
FosterProgramming
|
1343ddf7c3
|
Fix badge boost not applying in gen1 and 2 (#8013)
|
2025-10-22 22:57:04 +02:00 |
|
Eduardo Quezada
|
dc0d910182
|
Fixed Stomping Tantrum not doubling in damage if the user failed Protect (#8008)
|
2025-10-22 15:20:44 +02:00 |
|
PhallenTree
|
2416bfb53b
|
Fixes Echoed Voice base power increase depending on attacker's use of the move (#7997)
|
2025-10-22 13:39:24 +02:00 |
|
hedara90
|
3bb6cddffb
|
Fix Minior start of battle form (#7972)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-21 16:39:02 +02:00 |
|
FosterProgramming
|
24c595bfec
|
Fix psychic terrain affecting semi-invulnerable mons (#7986)
|
2025-10-20 13:38:01 +02:00 |
|
Alex
|
786859b6bb
|
Fix Fling Mental Herb message (#7984)
|
2025-10-19 22:38:27 +02:00 |
|
PhallenTree
|
38221b9de5
|
Fixes Shields Down incorrectly preventing status on Minior Core form (#7968)
|
2025-10-17 20:40:37 +02:00 |
|
FosterProgramming
|
bb4a876768
|
Fix Focus Energy boosting crit by the wrong amount with gen1 crit chance (#7956)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-16 21:34:40 +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 |
|
spindrift64
|
de3c031fc5
|
Fix Anticipation type effectiveness check (#7840)
|
2025-10-16 14:36:07 +02:00 |
|
AlexOn1ine
|
e365add4cf
|
15/10/25 Master to upcoming merge
|
2025-10-15 21:31:00 +02:00 |
|
grintoul
|
7e98dffc51
|
Tests for Battery ability (#7846)
|
2025-10-15 14:31:09 +02:00 |
|
ghoulslash
|
df5312c0bd
|
Fix Knock Off not being restored and Wild Battles (#7952)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-10-14 21:34:06 +02:00 |
|
Alex
|
2daa8f3c88
|
Remove EffectHitSetTerrain script to use moveeffect (#7938)
|
2025-10-13 15:39:10 +02:00 |
|
Alex
|
136e976362
|
Fixes terrain not failing on duplicate (#7939)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-10-13 15:38:23 +02:00 |
|
PhallenTree
|
78b11bb35f
|
Fixes Cursed Body failing to disable moves on the last PP (#7940)
|
2025-10-13 13:55:39 +02:00 |
|
Alex
|
eee546df06
|
Item battle effect refactor (#7857)
|
2025-10-12 08:59:33 +02:00 |
|