12107 Commits

Author SHA1 Message Date
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
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
Frank DeBlasio
41882b267d
Consolidate duplicate dialogue of nature girl in Battle Frontier (#6195) 2025-02-08 12:51:22 -08: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
Pawkkie
e77fe32dec
Fix Choice'd mons referring to incorrect move when switching (#6204) 2025-02-07 16:42: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
hedara90
f9d1fdcf4c
Follower Object Event refactor (#6129)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-06 21:12:42 +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
ghoulslash
b4fc611d5f
Cleanup some global battler ID usage (#6181)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2025-02-04 18:08:32 +01: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
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
Eduardo Quezada
64c5113b23 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-02 14:18:13 -03:00
hedara90
959e5a9e82
Add the header required for TPP tags to work (#6162)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-01 22:58:26 +01:00
Bassoonian
a0097ef395
Add Poltchageist family form data (#6163) 2025-02-01 17:46:59 -03:00
Pawkkie
881c7bd8ff
Clarify MOVE_EFFECT_SLEEP sleep clause handling (#6161) 2025-02-01 20:34:25 +01:00
Eduardo Quezada
7c6eda21b1
Added missing in-battle "Move Info" button prompt (#6155) 2025-02-01 18:47:36 +01:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154) 2025-01-31 22:02:26 +01:00
Alex
c5c22a0005
Fixes Dynamic Moves types in SumScreen while in Battle (#6145) 2025-01-31 21:50:26 +01:00
Eduardo Quezada
ee1b75614d Merge branch '_RHH/master' into _RHH/upcoming 2025-01-30 22:46:06 -03:00
khbsd
4fc56128d0
Add Mega Evo, Primal Reversion, and Ultra Necrozma OW sprites (#5874)
Co-authored-by: kittenchilly <mario.pikmin.zelda@gmail.com>
2025-01-30 22:29:20 -03:00
Alex
32eb5dfba5
Remove global sBattler_AI (#6128) 2025-01-29 19:58:16 +01:00
Alex
94c98e6233
Clean up follow up for Simultaneous Reduction HP (#6139) 2025-01-29 19:39:19 +01:00
psf
b130a3846e
Added Difficulty Fallback for Trainer Slides (#6088) 2025-01-29 19:09:00 +01:00
Alex
6432027f6b
Replace BattleStruct members quickClawRandom/quickDrawRandom with locals (#6136) 2025-01-29 07:02:40 -03:00
lordraindance2
392a16651b
Implemented clear animation for also overworld pokemon (#5825) 2025-01-28 20:04:16 -03:00
Eduardo Quezada
927bb8f833
Fixed AI not handling type effectiveness beyond x8 (#6127) 2025-01-28 19:16:10 +01:00
hedara90
4041af0b05
Removed stray semi-colon in AI code (#6134)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-28 19:14:12 +01:00
DizzyEggg
c77cf8284c
Fix safari zone crash on No Cash (#6132) 2025-01-28 13:11:39 +01:00
Frank DeBlasio
f3f03ec43f
Fixed Hoenn dex off by 1 issues (#6104) 2025-01-27 15:52:03 +01:00
Eduardo Quezada
a34a3cad36 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-26 22:57:11 -03:00
DizzyEggg
b2448ea002
Fix upcoming not working on no cash (#6121) 2025-01-26 20:25:57 -03:00
Frank DeBlasio
9b96462204
Consolidated contest opponent filters into gContestOpponents (#6119) 2025-01-26 23:12:49 +01:00
kittenchilly
058bf58b7b
Match current gen behavior for battle environment after fishing (#6099) 2025-01-26 22:39:14 +01:00