2719 Commits

Author SHA1 Message Date
kittenchilly
f747deb6ca
Fix Melmetal's weight (#6382) 2025-03-05 17:58:35 +01:00
Ruby
ec8344c2ad
Fixed a missing ) in trainers.party comment block. (#6367) 2025-03-02 15:00:57 +01:00
Hedara
06d31bc8ea Merge branch 'master' into final-1.10-master-upcoming-merge 2025-02-26 22:07:10 +01:00
hedara90
cf43787d72
Added MOVE_TARGET_OPPONENT and added it to Me First, (#6336)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-25 22:28:22 +01:00
hedara90
4cf219e5c7
Resized gimmick indicators to reduce VRAM usage (#6319)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-02-22 12:28:53 -03:00
Eduardo Quezada
fe7ed22f5b Merge branch '_RHH/master' into _RHH/upcoming 2025-02-20 19:44:00 -03:00
Eduardo Quezada
ff098bc520
Reverted compound literal OW mon pic tables (#6216) 2025-02-19 19:17:59 +01:00
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up (#6272) 2025-02-17 22:07:30 +01:00
Alex
264e72c1a1
Use more accurate count in MovesInfo (#6260) 2025-02-13 20:22:10 -03:00
Frank DeBlasio
d1b2b045d0
Moved sValidApprenticeMove into gMovesInfo (#6254) 2025-02-13 14:58:12 -03:00
Eduardo Quezada
845679471f
Added missing Dream Eater and Reflect Type tests (#6245) 2025-02-13 17:32:08 +01:00
Eduardo Quezada
9c4fbbf274 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-13 13:06:32 -03:00
Eduardo Quezada
3507862164 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-12 09:30:59 -03:00
Eduardo Quezada
860c2f6cbc
Remove whitespace from trainers data file (#6234) 2025-02-12 00:27:33 +01:00
Hedara
e0e73983c7 Merge remote-tracking branch 'pret/master' into pret-merge-2025-02-11 2025-02-11 11:20:37 +01:00
Frank DeBlasio
3be1d1d91e
Consolidated Frontier teams into battle_frontier_trainers.h (#5892) 2025-02-09 22:17:10 +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
Bassoonian
82b0eff16c
Fix typo in Nuzzle's description (#6209) 2025-02-07 15:26:16 -03:00
Alex
765a12f520
Convert max effects to normal move effects (#6143) 2025-02-06 21:02:39 -03: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
64c5113b23 Merge branch '_RHH/master' into _RHH/upcoming 2025-02-02 14:18:13 -03:00
Bassoonian
a0097ef395
Add Poltchageist family form data (#6163) 2025-02-01 17:46:59 -03:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs (#6154) 2025-01-31 22:02:26 +01: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
a34a3cad36 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-26 22:57:11 -03:00
Frank DeBlasio
9b96462204
Consolidated contest opponent filters into gContestOpponents (#6119) 2025-01-26 23:12:49 +01:00
Cafe
37b6f031c8
Duraludon battle animation (#6086) 2025-01-26 17:27:05 +01:00
hedara90
e1e3bcfa91
Tera starstorm (#6073)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-26 11:08:46 +01:00
Frank DeBlasio
9e10f680a9
Move flag fixes (#6107) 2025-01-26 09:48:38 +01:00
Eduardo Quezada
6a3d95b422 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-25 22:29:12 -03:00
hedara90
88986baf5f
Trainer Party Pools (#5731)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-01-25 13:28:46 +01:00
Bassoonian
c372a3bf82
Fix Enamorus not changing forms (#6093) 2025-01-24 07:59:24 -03:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" (#6082) 2025-01-22 21:50:39 +01: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
Eduardo Quezada
4825e523ce
Moved mon pic tables to gSpeciesInfo + macro cleanup (#5597) 2025-01-20 07:52:29 -08:00
kittenchilly
4bcb07a6a7
Add Clodsire second frame and fixed Grookey backsprite + overworld (#6047) 2025-01-20 09:49:20 +01:00
Eduardo Quezada
3cdcb4b282
Moved front animations frames to gSpeciesInfo (#5605)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-01-19 21:14:12 -08:00
Eduardo Quezada
f6a86a65ef Merge branch '_RHH/master' into _RHH/upcoming 2025-01-19 10:32:57 -03:00
Frank DeBlasio
6be3d337c0
Re-removed trainers.h trailing whitespace (#6048) 2025-01-19 11:33:39 +01:00
Raymond Dodge
a3d0978762
Replace easy_chat alphabetialOrder magic numbers with EC_INDEX values (#2096) 2025-01-18 20:58:03 -05:00
Eduardo Quezada
cd1482bbaa
Expanded Pokémon Follower transformation functionality (#5048) 2025-01-18 23:19:06 +01: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
Eduardo Quezada
cacd07db9a Merge branch '_RHH/master' into _RHH/upcoming 2025-01-17 13:49:32 -03:00
moostoet
3b19f6972b
Rename Furfrou Species tags to match Pokemon Showdown exports (#6041) 2025-01-17 14:39:52 -03:00