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 |
|
PhallenTree
|
cf5b95cee8
|
Fixes Expanding Force and Spectral Thief move animations (#6185)
|
2025-02-09 22:34:48 +01: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 |
|
Frank DeBlasio
|
3be1d1d91e
|
Consolidated Frontier teams into battle_frontier_trainers.h (#5892)
|
2025-02-09 22:17:10 +01:00 |
|
Eduardo Quezada
|
d510a3957d
|
Fixed Future Sight not being affected by Electrify (#6213)
|
2025-02-09 21:57:29 +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 |
|
Eduardo Quezada
|
621d2ef83d
|
Fixed missing move encapsulation in upcoming (#6226)
|
2025-02-09 20:03:53 +01:00 |
|
Eduardo Quezada
|
d3417b00a2
|
Fixed compilation error when turning P_GENDER_DIFFERENCES off (#6223)
|
2025-02-09 15:37:56 +01:00 |
|
AlexOn1ine
|
4babfd003e
|
rhh merge/upcoming
|
2025-02-09 14:04:21 +01:00 |
|
明雅
|
d45a6487ab
|
Fix Using a Safari Ball crashes the game #6206 (#6220)
|
2025-02-09 09:50:01 -03:00 |
|
AlexOn1ine
|
f2bd88a7f9
|
EndTurnEffectsOrder Refactor
|
2025-02-09 13:48:08 +01:00 |
|
psf
|
a8c9857a56
|
Prevented fanfares from playing in headless mode (#6219)
|
2025-02-09 09:06:22 -03: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 |
|
ghoulslash
|
6f541bb449
|
Fix Liquid Ooze + Leech Seed Test (#6217)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-02-08 22:42:25 +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 |
|
Bassoonian
|
82b0eff16c
|
Fix typo in Nuzzle's description (#6209)
|
2025-02-07 15:26:16 -03:00 |
|
Eduardo Quezada
|
f9ad409715
|
Adjusted G-Max Depletion test (#6201)
|
2025-02-07 17:37:36 +01:00 |
|
Pawkkie
|
e77fe32dec
|
Fix Choice'd mons referring to incorrect move when switching (#6204)
|
2025-02-07 16:42:08 +01:00 |
|
ghoulslash
|
96ee24c726
|
Minor Terrain Seed Test Improvement (#6207)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-02-07 16:40:10 +01: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 |
|
Eduardo Quezada
|
473cf265a4
|
Fixed regression from master/upcoming merge (#6199)
|
2025-02-07 00:03:57 +01:00 |
|
hedara90
|
58eb635499
|
Follower Object Event refactor (#6129)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-06 21:20:38 +01:00 |
|
hedara90
|
f9d1fdcf4c
|
Follower Object Event refactor (#6129)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-06 21:12:42 +01:00 |
|
ghoulslash
|
3ba4e3c0c7
|
Sheer Force Test Fixes (#6198)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-02-06 20:17:57 +01:00 |
|
Alex
|
4fd0c3a5be
|
Master to upcoming (#6194)
|
2025-02-06 19:11:10 +01:00 |
|
ghoulslash
|
41bda98031
|
Unify setreflect/setlightscreen and MOVE_EFFECT_REFLECT/LIGHT_SCREEN (#6196)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2025-02-06 18:22:01 +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 |
|
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 |
|
hedara90
|
ea3b81218b
|
Wrote tests for Electrify (#6179)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-04 12:37:42 -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 |
|
GriffinR
|
cdadd7d2ed
|
Generate heal location constants automatically, move data back to a single file.
|
2025-02-03 20:25:11 -05:00 |
|
hedara90
|
a642759798
|
Changed two LocalRandom calls to new LocalRandom32 (#6173)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-02-03 23:32:29 +01:00 |
|
GriffinR
|
678fdf9979
|
Merge pull request #2047 from GriffinRichards/generate-map-constants
Generate local IDs from map.json files
|
2025-02-03 16:18:32 -05:00 |
|
Eduardo Quezada
|
e9c14e35ca
|
Cleaned up party data access GetPartyBattlerData (#6172)
|
2025-02-03 20:34:15 +01:00 |
|
tertu
|
14178edfe3
|
Don't use SeedRng some places where it isn't necessary (#6156)
|
2025-02-03 20:03:13 +01:00 |
|
PhallenTree
|
5238665a7a
|
Fixes Suction Cups ability popup and Red Card + Guard Dog interaction (#6171)
|
2025-02-03 18:31:14 +01:00 |
|
Eduardo Quezada
|
fe41f9eaf5
|
Fixed non-regional forms breeding incorrectly (#4985)
|
2025-02-03 17:03:29 +01:00 |
|
Pawkkie
|
37dd57b1b5
|
AI adds score to Pursuit if it OHKOs (#6166)
|
2025-02-03 13:00:42 +01:00 |
|
moostoet
|
ddff2def40
|
Prevent sameMoveTurns from incrementing when unable to use move (#6167)
|
2025-02-02 22:11:25 +01:00 |
|