6935 Commits

Author SHA1 Message Date
PhallenTree
9479b67964
Remove pursuitSwitchByMove and additional if statement (#6326) 2025-02-23 11:49:00 +01:00
Alex
7c78053a8c
Clean up leftover from simu hp reduction development (#6323) 2025-02-22 21:56:30 +01:00
hedara90
622a7f9a85
Refactor testing flags and vars to not conflict with user ones (#6301)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-22 15:32:39 +01:00
Pawkkie
b7df5b8c29
Fix Overzealous Absorber Switching (#6318) 2025-02-22 10:37:11 +01:00
Alex
3dd0f95ddd
Fixes Tera Shell activating on moves that have no effect on target (#6271) 2025-02-21 23:11:07 +01:00
Pawkkie
bf263efa4b
Fix AI hazard move handling, minor AI tweaks (#6311) 2025-02-21 09:58:14 +01:00
Eduardo Quezada
fe7ed22f5b Merge branch '_RHH/master' into _RHH/upcoming 2025-02-20 19:44:00 -03:00
Alex
82f6d477b6
Fix padding amount in MoveInfo (#6307) 2025-02-20 17:03:01 +01:00
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up (#6272) 2025-02-17 22:07:30 +01:00
PhallenTree
b1c597495b
Fixes Called moves ignoring redirection (#6267) 2025-02-14 13:47:02 +01:00
Alex
de8d25da55
Expand usage of IsBattlerAlly (rename from IsAlly) (#6251) 2025-02-14 12:31:21 +01:00
Alex
53727aa23d
Fixes ability Embody Aspect triggering multiple times (#6259)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-14 12:26:49 +01:00
Frank DeBlasio
d1b2b045d0
Moved sValidApprenticeMove into gMovesInfo (#6254) 2025-02-13 14:58:12 -03:00
moostoet
a42de40eb2
Add function to adjust AI scoring for generalized item effects (#6247) 2025-02-13 12:51:25 -05:00
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03:00
Alex
8448e745ea
Adds a follower flag define to disable followers on the fly (#6174) 2025-02-13 17:33:59 +01:00
Alex
0438b66f63
Minor Clean up for CanAbilityX. Follow up for #6183 (#6252) 2025-02-13 17:33:21 +01:00
Bassoonian
5aeeb3365f
Merrp merge (12th of February) (#6244) 2025-02-13 16:19:40 +01:00
Hedara
0da3e49889 Review comments 2025-02-13 10:36:52 +01:00
hedara90
9aea7c8e3a
Changed bit order for follower graphicsId creation (#6249)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-12 23:36:37 +01:00
Zatsu
4f3326f3f4
fix for battle ui for add to party menu (#6229) (#6240) 2025-02-12 22:02:25 +01:00
Hedara
a859f40e37 Review comments 2025-02-12 14:31:42 +01:00
Hedara
7426a98dc5 Merge remote-tracking branch 'merrp/followers-expanded-id' into merrp-merge 2025-02-12 13:34:28 +01:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
Alex
72de12609c
Fixes BATTLER_TURN_DAMAGED battler id (#6236) 2025-02-11 16:18:00 -03:00
Alex
cc9ca81c29
Add abstraction layer for battler positions (#6212) 2025-02-11 11:32:34 -05:00
Ariel A
c8fb56d73b Merge branch 'followers' into followers-expanded-id 2025-02-10 00:24:50 -05:00
Ariel A
ef05bbf394 Merge remote-tracking branch 'upstream/master' into followers 2025-02-10 00:11:38 -05:00
Pawkkie
579fa6410d
Switch chance config support (#6187) 2025-02-10 00:30:54 +01:00
hedara90
174bc2f29f
Fixed typo in requests_effects (#6215)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-09 16:59:31 -05:00
Eduardo Quezada
99cb40d896
Added test support for 5 battle configs (#5914)
Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-02-09 22:29:23 +01:00
Pawkkie
bd50fe6014
Fix AI switching in absorbing mon incorrectly (#6227) 2025-02-09 22:28:06 +01:00
Eduardo Quezada
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210) 2025-02-09 21:54:03 +01:00
Alex
5f13f9545f
Redefine IsBattlerAlive in battle.h as a static inline (#6211) 2025-02-09 14:09:23 -05:00
Zatsu
43bce41796
Add caught mon to full party by sending a different mon to the Box (#6058)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-02-09 00:54:58 +01:00
Frank DeBlasio
41882b267d
Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195) 2025-02-08 12:51:22 -08:00
Alex
de9e9af1b7
Fixes Spectral Thief stealing boost at the wrong time (#6197)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2025-02-07 16:24:05 -05:00
Eduardo Quezada
e29e1c6ca7 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-07 15:33:26 -03:00
Eduardo Quezada
b51598c14d
Removed Trainer Slides footgun (#6205) 2025-02-07 13:30:57 +01:00
Alex
765a12f520
Convert max effects to normal move effects (#6143) 2025-02-06 21:02:39 -03:00
hedara90
f9d1fdcf4c
Follower Object Event refactor (#6129)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-06 21:12:42 +01:00
Hedara
27da389d1e Merge branch 'master' into master-to-upcoming 2025-02-06 13:05:02 +01:00
Pawkkie
4359cbb77c
SwitchType enum to clean up GetMostSuitableMonToSwitchInto (#6184) 2025-02-05 16:49:53 +01:00
ghoulslash
dc21befcc9
CanAbilityX Function Cleanup (#6183)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-05 16:48:51 +01:00
hedara90
cad1a37566
Tachyon Cutter and Salt Cure animations (#6182)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-05 15:27:21 +01:00
Alex
b90b1e2546
Clean up - Add ability args instead of calcing the ability again (#6186) 2025-02-04 18:04:05 -05:00
tertu
14178edfe3
Don't use SeedRng some places where it isn't necessary (#6156) 2025-02-03 20:03:13 +01:00
Eduardo Quezada
fe41f9eaf5
Fixed non-regional forms breeding incorrectly (#4985) 2025-02-03 17:03:29 +01:00
Eduardo Quezada
64c5113b23 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-02 14:18:13 -03:00
Alex
f8c2e860d7
Remove unused PainSplit scripting global (#6164) 2025-02-02 14:50:39 +01:00