2251 Commits

Author SHA1 Message Date
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
AlexOn1ine
5ee5aa796a merge rhh/upcoming 2025-02-12 21:01:21 +01:00
AlexOn1ine
3c09e43a20 minor reviews 2025-02-12 18:51:50 +01:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
Alex
cc9ca81c29
Add abstraction layer for battler positions (#6212) 2025-02-11 11:32:34 -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
Eduardo Quezada
d510a3957d
Fixed Future Sight not being affected by Electrify (#6213) 2025-02-09 21:57:29 +01:00
Alex
5f13f9545f
Redefine IsBattlerAlive in battle.h as a static inline (#6211) 2025-02-09 14:09:23 -05:00
Eduardo Quezada
621d2ef83d
Fixed missing move encapsulation in upcoming (#6226) 2025-02-09 20:03:53 +01:00
AlexOn1ine
4babfd003e rhh merge/upcoming 2025-02-09 14:04:21 +01:00
AlexOn1ine
f2bd88a7f9 EndTurnEffectsOrder Refactor 2025-02-09 13:48:08 +01:00
Alex
765a12f520
Convert max effects to normal move effects (#6143) 2025-02-06 21:02:39 -03:00
Eduardo Quezada
473cf265a4
Fixed regression from master/upcoming merge (#6199) 2025-02-07 00:03:57 +01:00
Hedara
27da389d1e Merge branch 'master' into master-to-upcoming 2025-02-06 13:05:02 +01:00
hedara90
f6d1773e51
Fixed Unnerve message and wrote tests (#6192)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-05 22:29:13 +01:00
ghoulslash
dc21befcc9
CanAbilityX Function Cleanup (#6183)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-05 16:48:51 +01:00
Alex
b90b1e2546
Clean up - Add ability args instead of calcing the ability again (#6186) 2025-02-04 18:04:05 -05:00
ghoulslash
b4fc611d5f
Cleanup some global battler ID usage (#6181)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-04 18:08:32 +01:00
Eduardo Quezada
ee1b75614d Merge branch '_RHH/master' into _RHH/upcoming 2025-01-30 22:46:06 -03:00
Alex
94c98e6233
Clean up follow up for Simultaneous Reduction HP (#6139) 2025-01-29 19:39:19 +01:00
DizzyEggg
c77cf8284c
Fix safari zone crash on No Cash (#6132) 2025-01-28 13:11:39 +01:00
PhallenTree
6b23a02e7d
Fix Powder config not checking for Powder status (#6113) 2025-01-26 18:12:18 +01:00
PhallenTree
4158f9251f
Fix Powder (status) config and some terrain timers not using gBattleTurnCounter (#6109) 2025-01-26 13:06:11 +01:00
Frank DeBlasio
a2b51a2381
Terrain function standarization (#6097) 2025-01-25 23:27:39 +01:00
Pawkkie
17f3541a60
Eject item ace flag switch AI fixes (#6098) 2025-01-25 23:19:47 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation (#5982) 2025-01-25 22:02:39 +01:00
Alex
77b677dbf9
Introduces BattleTurnCounter to simplfy timer checks (#6080) 2025-01-25 14:26:38 -05:00
Eduardo Quezada
cd84e07341 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-23 23:01:25 -03:00
psf
b109aa0c92
Cleaned up Trainer Slides, added automated Trainer Slide tests, add new Enemy Critical Hit Slide (#6018) 2025-01-23 16:28:33 +01:00
Alex
f2840cb047
Fixes Eject Pack triggering twice on Intimidate (#6072) 2025-01-21 17:58:52 -05:00
Alex
ac9c8ac3bb
Replace WEATHER_HAS_EFFECT with HasWeatherEffect (#6069) 2025-01-21 08:43:45 +01:00
Alex
da9943d3b8
Clean up array access by using index instead of dereferencing the value (#6057) 2025-01-20 16:44:22 +01:00
Eduardo Quezada
f6a86a65ef Merge branch '_RHH/master' into _RHH/upcoming 2025-01-19 10:32:57 -03:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality (#5048) 2025-01-18 23:19:06 +01:00
AERDU
e4e4460636
fixed bug giving immunity to full-paralysis when B_MAGIC_GUARD is >= GEN_4 (#6032) 2025-01-18 19:54:20 +01:00
Eduardo Quezada
cacd07db9a Merge branch '_RHH/master' into _RHH/upcoming 2025-01-17 13:49:32 -03:00
cawtds
75d5edad08
Fix UB when accessing move result flags (#6030)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-01-15 21:30:25 +01:00
ghoulslash
fd26d3a406
Fix Redirection Abilities Not Drawing in Ally Moves (#6026)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-01-15 15:20:31 +01:00
Eduardo Quezada
ce40c3356c Merge branch '_RHH/master' into _RHH/upcoming 2025-01-12 08:42:57 -03:00
Alex
9e8ab3d891
Fixes Tera giving boost to dynamic bp moves (#6008) 2025-01-12 00:59:12 +01:00
Alex
ddef67bbb1
Future Sight Innards Out follow up for upcoming (#5998) 2025-01-12 00:25:50 +01:00
Alex
10a3ed2044
Use gCurrentMove instead of checking FF move (#5999) 2025-01-12 00:25:17 +01:00
Alex
8f34c76395
Removes Resource Flags and moves fields to DisableStruct (#5945) 2025-01-11 09:39:10 -03:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
Alex
6e5f40d506
Introduces BattlerState struct for the Battle Engine (#5954) 2025-01-11 07:12:22 -03:00
Eduardo Quezada
c33c38e020
Remove form change function footguns (#5995) 2025-01-11 09:57:39 +01:00
Eduardo Quezada
0fefb444de
Multiple removals of hardcoded move IDs (#5964) 2025-01-10 17:07:32 -05:00
Alex
75a2d419e1
Follo up for Innards Out / Future Sight interaction (#5967) 2025-01-10 16:59:37 +01:00