2297 Commits

Author SHA1 Message Date
AlexOn1ine
e2e012c3a9 conflicts 2025-04-21 15:50:57 +02:00
cawtds
0069ec1f0c
Fix captivate-oblivious interaction and related test (#6653) 2025-04-21 11:01:01 +02:00
Alex
db7e45f1d6
Sky Drop clean up and tests (#6218)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 23:07:46 +02:00
Alex
86969f9919
Remove HitmarkerSwapAttackerTarget (#6627)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:52 +02:00
Alex
fedbce510b
Fixes commander activation on a fainted mon (#6632)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:18 +02:00
Eduardo Quezada
c650199909
Added missing gMovesInfo encapsulation (#6656) 2025-04-20 22:36:27 +02:00
Bivurnum
d342b373f0
Fix no eligible mons when only the partner wins in multi battle (#6626) 2025-04-19 14:15:13 +02:00
Alex
6b09480912
Fixes some restore issues (#6629) 2025-04-18 16:57:04 -04:00
Alex
37f72bb237
Fix Mirror Armor and Obstruct interaction (#6630)a 2025-04-18 16:21:57 -04:00
AlexOn1ine
2d1b2f28c4 Fixes Gulp Missile freezing the game if when attacker fainted 2025-04-17 19:46:16 +02:00
AlexOn1ine
fd0766c7fa 17-04-25-master-merge 2025-04-17 14:14:37 +02:00
Bassoonian
cca969b04d
Adds move effect type checking (#6618) 2025-04-16 00:08:57 +02:00
Bassoonian
512368fd03
Add type checking for hold item effects (#6619) 2025-04-15 23:33:00 +02:00
PhallenTree
3b05d7934f
Fixes wrong battler's Illusion wearing off when the Attacker faints and fixes Illusion tests (#6596) 2025-04-14 18:17:24 +02:00
ghoulslash
81ed774c00
EndTurnEffectOrder Refactor (#6224) 2025-04-14 10:57:34 -04:00
Alex
caa878002a
Remove redundant bit for Throat Spray (#6593) 2025-04-13 16:22:04 +02:00
Bassoonian
6a70f4f390
Turn battle string ids into enums (#6594) 2025-04-13 16:12:30 +02:00
psf
e146940f25
Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups (#4901)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-12 10:23:48 +02:00
Alex
4aca2fdcd3
Refactor fixed damage moves (#6449)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 15:01:02 +02:00
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +02:00
Alex
7bf156be0e
Refactors Move absorb / block function calls to remove redundancy (#6490)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-08 14:26:18 +02:00
AlexOn1ine
b94e3298fc dynamax fix 2025-04-06 15:25:12 +02:00
AlexOn1ine
e8cc3c81f8 conflicts 2025-04-06 14:59:12 +02:00
Alex
5b9077e207
Refactor / Simlify Cmd_adjustdamage and remove redundancy (#6499) 2025-04-02 23:52:54 +02:00
Alex
c1f18d0765
Refactor protect to allow at least 126 different types of protect eff… (#6506) 2025-04-02 17:26:05 +02:00
Alex
ae62c80d0f
Refactors faint target abilities and adds Battle Bond config (#6519)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-02 16:00:23 +02:00
Alex
edb196e851
Fixes Red Card against Dynamaxed mons (#6526) 2025-04-02 14:28:53 +02:00
AlexOn1ine
0c35879e02 conflicts 2025-04-01 19:11:55 +02:00
Hedara
881d924cf3 Fix using items to heal partner in battle 2025-04-01 10:38:12 +02:00
AlexOn1ine
ccebebf64f 31-03-25 Master merge 2025-03-31 18:23:46 +02:00
Alex
093e265515
Fixes Destiny Bond against Dynamax no failing (#6501) 2025-03-30 14:18:21 +02:00
Alex
388389714b
Rename removelishtscreenreflect to removescreens (#6495) 2025-03-30 10:52:24 +02:00
Alex
adf4928fe0
Fixes timesGotHit not increasing on forced switch out (#6493) 2025-03-29 19:33:50 +01:00
Alex
79a2ec1ce2
Fixes Emergency Exit and Eject Pack (#6459) 2025-03-29 14:04:01 +01:00
Alex
06c4a37b1f
Remove potential pitfall with saved damage for recoil moves (#6485) 2025-03-28 15:52:50 +01:00
Alex
ce3d6a924a
Fixes clear body type effect and clear amulet against protect effects (#6482) 2025-03-28 11:35:06 +01:00
AlexOn1ine
ae640f0714 25-03-25 master to upcoming merge 2025-03-25 21:39:58 +01:00
Alex
5ec301f04a
Removes unused Special Status members (#6479) 2025-03-25 21:15:25 +01:00
Alex
10412e1a47
Fixes protective pads against Protects secondary effects (#6474) 2025-03-25 16:30:15 +01:00
hedara90
ecab04d881
Sucker punch vs struggle (#6475)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-03-25 13:22:41 +01:00
Alex
1d6d6a2bdf
Fixes choice move locking at the wrong time (#6467) 2025-03-24 14:59:36 +01:00
Alex
b93976c980
Fixes Cheek Pouch mutating damage (#6466) 2025-03-23 23:34:24 +01:00
Bassoonian
9a23f19575
19-03-25 master to upcoming merge (#6450) 2025-03-20 09:57:05 +01:00
Alex
adc2c61fe8
Unifies dynamic move category checks (#6443) 2025-03-19 23:06:08 +01:00
AlexOn1ine
3c632b8b44 19-03-25 master to upcoming merge 2025-03-19 17:12:47 +01:00
Alex
8dfd3bd278
Fixes Magic Coat message when move is bounced back (#6419)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-03-19 13:57:48 +01:00
Pawkkie
411a236ce7
Fix AI using Scald / fire moves against frozen / frostbitten targets (#6442) 2025-03-19 09:32:59 +01:00
Alex
4193963096
Fixes Cotton Spore failing if one of the targets blocks it (#6418)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2025-03-18 15:41:37 +01:00
Alex
0db9043c52
Rename absentBattlerFlags to absent (#6432) 2025-03-17 21:51:04 +01:00
Alex
99a3d01877
Fixes dynamax reversion when ejected out + anim fix (#6416)
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-17 19:57:38 +01:00