3095 Commits

Author SHA1 Message Date
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03: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
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
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
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
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes (#6210) 2025-02-09 21:54:03 +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
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
hedara90
cad1a37566
Tachyon Cutter and Salt Cure animations (#6182)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-05 15:27:21 +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
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
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
bassforte123
72edeeffad
Update pokemon.h with nature comments (#6133) 2025-01-28 21:37:02 +01:00
Eduardo Quezada
927bb8f833
Fixed AI not handling type effectiveness beyond x8 (#6127) 2025-01-28 19:16:10 +01:00
hedara90
e1e3bcfa91
Tera starstorm (#6073)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-26 11:08:46 +01:00
Pawkkie
43e41bbed8
Add Code Entry functionality (#5951) 2025-01-25 22:03:08 +01:00
Salem
01e8d8233e
Trainer Battle Parameter Consolidation (#5982) 2025-01-25 22:02:39 +01: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
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" (#6082) 2025-01-22 21:50:39 +01:00
hedara90
2a8f4b03dc
Revert "Revert map related enum conversion" (#6079) 2025-01-22 21:25:24 +01:00
hedara90
2b9c5fe4e7
Revert map related enum conversion (#6078)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-22 19:37:56 +01:00
Pawkkie
3c5bd4d16c
Return the universe to a state of balanced quilibrium (#6074) 2025-01-21 18:25:15 -05:00
Eduardo Quezada
ed505cfb5f Merge branch '_RHH/master' into _RHH/upcoming 2025-01-21 19:32:51 -03:00
Alex
b2f2a8c9fb
Fixes Rapid Spin / Toxic Debris interaction (#6023)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-01-21 21:43:54 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums (#6071) 2025-01-21 21:19:41 +01:00
Pawkkie
7d39dd4aae
Add AI_FLAG_PREDICT_INCOMING_MON: AI will score against predicted switchin if predicting switch (#6037) 2025-01-20 20:54:38 +01:00
khbsd
52666fb545
IV/EV Info on Summary Screen (#6027) 2025-01-20 09:41:31 +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
Alex
9ed3b176f0
Pret merge (17 of January) (#6045) 2025-01-18 19:53:29 +01:00
Bassoonian
199760a6d3
Add known failing learnset cap test (#6046) 2025-01-17 21:04:46 -05:00
Bassoonian
bcf9a1eff8 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge17jan 2025-01-17 21:57:25 +01:00
GriffinR
2f67b17571
Document bard music (#2053)
* Missing bard song limit constants
* Index bard sound arrays with word constants
* Document bard music
2025-01-17 17:54:38 +00:00
moostoet
3b19f6972b
Rename Furfrou Species tags to match Pokemon Showdown exports (#6041) 2025-01-17 14:39:52 -03:00