7396 Commits

Author SHA1 Message Date
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
AlexOn1ine
b4f17c7506 review comments 2025-02-11 12:06:16 +01:00
Ariel A
c8fb56d73b Merge branch 'followers' into followers-expanded-id 2025-02-10 00:24:50 -05:00
Ariel A
a4e032c28d Merge branch 'followers' into lighting 2025-02-10 00:19:48 -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
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
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
GriffinR
cdadd7d2ed Generate heal location constants automatically, move data back to a single file. 2025-02-03 20:25:11 -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
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
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
Eduardo Quezada
1c3cabb52a Fix typo 2025-01-30 18:46:06 -03:00
Eduardo Quezada
370cfd5bb4 Begin 1.10.3 cycle 2025-01-30 18:40:03 -03:00
Eduardo Quezada
397e98b954
Version 1.10.2 (#6144) 2025-01-30 18:38:28 -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
Alex
6432027f6b
Replace BattleStruct members quickClawRandom/quickDrawRandom with locals (#6136) 2025-01-29 07:02:40 -03:00
bassforte123
72edeeffad
Update pokemon.h with nature comments (#6133) 2025-01-28 21:37:02 +01:00
Alex
49cbebd212
Remove formToChangeInto (Unused) (#6137) 2025-01-28 17:11:11 -03:00
Eduardo Quezada
927bb8f833
Fixed AI not handling type effectiveness beyond x8 (#6127) 2025-01-28 19:16:10 +01: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
Eduardo Quezada
be74612b9e u32 in FadeScreenHardware 2025-01-26 17:17:37 -03:00
Eduardo Quezada
3fc9b0195d Cleaned up code to align with previous review comments 2025-01-26 17:14:00 -03:00