12991 Commits

Author SHA1 Message Date
Alex
0ca588943b
Fixes choiced moves not locked in after ability block (#5738) 2024-12-01 13:45:35 +01:00
Eduardo Quezada
1a581c407c Merge branch '_RHH/master' into _RHH/upcoming 2024-12-01 08:11:32 -03:00
SarnPoke
987264caea
Deoxys Sprite/Animation Fixes (#5603) 2024-11-30 21:35:44 -03:00
Eduardo Quezada
2f62adb902
Master to upcoming (again, for pret merge), 2024-11-30 (#5740) 2024-11-30 21:24:34 -03:00
Alex
b3b0973fbb
Fixes Population Bomb / Triple Kick missing message (#5747) 2024-11-30 18:06:17 -05:00
Alex
3343a16a7c
Fixes Dynamax dynamic move type (#5739) 2024-11-30 17:49:50 -05:00
Pawkkie
953f2292e2
Fixes Switch in flag not restoring mons properly with test (#5746) 2024-11-30 23:39:27 +01:00
Alex
51fbc80ac5
Fixes Misty Terrain displaying wrong message (#5742) 2024-11-30 17:32:46 -05:00
kittenchilly
ec60c6536c Merge branch 'master' into upcoming-pret-merge-nov 2024-11-30 10:49:37 -06:00
hedara90
e4ef3a440f
Automatic Line Breaks, somewhat even lines (#5689)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-11-29 18:46:45 +01:00
Hedara
2125bee3cd Merge remote-tracking branch 'pret/master' into pret-to-master 2024-11-29 13:36:26 +01:00
Hedara
f6fdca615f Merge branch 'master' into master-to-upcoming 2024-11-29 11:32:12 +01:00
Alex
0f4b598984
Fixes Aegislash not reverting back (#5734) 2024-11-28 23:21:42 +01:00
Alex
0cd0e0b005
Fixes Blunder Policy (#5722) 2024-11-28 11:24:38 +01:00
Alex
88cdd8bdfb
Fixes Kee Maranga and Enigma Berry (#5727) 2024-11-28 11:22:32 +01:00
Alex
174177a4d5
Fixes minor move desc errors (#5728) 2024-11-28 11:17:48 +01:00
Alex
846427ac43
Fixes gems triggering on confusion damage (#5723) 2024-11-27 14:08:38 -05:00
Sadfish the Sad
64887ee876
dark void, clangorous soulblaze, vortex animation fixes (#5650) 2024-11-25 19:57:22 +01:00
Eduardo Quezada
4beb0efbcc
Added extra encoded character support (#2050) 2024-11-24 20:46:01 -05:00
hedara90
d924b361e6
Added Minimize interaction to Supercell Slam (#5713)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-11-24 23:04:43 +01:00
hedara90
e7e701f8ec
Trainer class+name expansion fix for Battle Frontier (#5699)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-11-23 23:10:34 +01:00
GriffinR
382ee9e276 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-11-23 16:10:33 -05:00
Alex
194f7644b8
Changes taget bit of Flower Shield (#5698) 2024-11-23 12:02:40 -05:00
AlexOn1ine
97b30cb712 simultaneous hp reduction 2024-11-23 08:35:01 +01:00
Alex
612c8d3ff6
Fixes heal blocked leeach seed in tests (#5700) 2024-11-21 17:18:44 +00:00
PhallenTree
596b8b20f4
Fixes Neutralizing Gas crashes + adds missing interaction, Regenerator small fix (#5694) 2024-11-21 17:35:05 +01:00
Alex
3cc048cc01
Removes redundant Decorate check (#5696) 2024-11-21 00:13:31 -05:00
Alex
81442e32e2
Changes name of B_SCR_NAME_WITH_PREFIX (#5675) 2024-11-20 09:46:50 -03:00
Martin Griffin
f775b09ae0
Merge pull request #2055 from GriffinRichards/spinda-spots
Add TRY_DRAW_SPOT_PIXEL
2024-11-20 12:22:59 +00:00
Alex
572ea141af
Fixes Absorb regression caused by #5670 (#5688) 2024-11-19 14:56:34 -05:00
Eduardo Quezada
b2ef363ac8 Merge branch '_RHH/master' into _RHH/upcoming 2024-11-19 14:19:53 -03:00
Alex
70ca5060f9
Fixes wrong Id when AI chooses mon to switch in (#5684) 2024-11-18 17:18:26 -05:00
Alex
9f1b900809
Fixes Ice Face regression (#5678) 2024-11-17 16:36:55 -03:00
AERDU
5388ed0cad
Mimicry updates typing with RemoveAllTerrains() (#5666)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-11-17 10:21:01 +01:00
Alex
67c7106fee
Refactors Absorb to use Moveend (#5670) 2024-11-17 09:59:04 +01:00
kittenchilly
c4d83079a9
PokeCommunity sprites batch (October) (#5655) 2024-11-15 21:16:41 +01:00
GriffinR
039bc02546 Use size constants for MAPSEC popup theme array 2024-11-12 22:28:01 -05:00
AlexOn1ine
cd3245cbf0 maybe better names 2024-11-12 23:33:35 +01:00
AlexOn1ine
4dc784bd2d fix conflict 2024-11-12 23:30:49 +01:00
AlexOn1ine
3204454853 Critical Hit documentation and distorted match up struct switch 2024-11-12 23:27:53 +01:00
Lactozilla
b60da57d8a Remove usage of gHeap in sSpritePalettes_ContestantsTurnBlinkEffect
Those offsets into gHeap are actually just inside of eContestTempSave.
2024-11-12 14:28:33 -03:00
hedara90
1d7e4cf8fc
Cleans up Primal Reversion code (#5659) 2024-11-12 13:48:06 +01:00
Alex
b55c87f73f
Fixes Take heart (#5658)
Co-authored-by: KyleLaporte <moog272@gmail.com>
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:58:09 -05:00
Alex
a8351e305c
Fixes Red Card / Eject Pack interaction with Emergency Exit (#5657)
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-11-11 14:56:51 -05:00
AlexOn1ine
a3fe53dd28 Cleans up Primal Reversion code 2024-11-11 20:31:21 +01:00
Eduardo Quezada
b48e5770be Merge branch '_RHH/master' into _RHH/upcoming 2024-11-11 15:58:42 -03:00
ghoulslash
418d127325 initialize weight in inner loop of DexNavPickTile 2024-11-11 12:39:26 -05:00
ghoulslash
931a05f12b Mrcrge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2024-11-11 12:38:52 -05:00
Alex
afc7795afc
Removes duplicate Booster Energy code (#5656) 2024-11-11 17:48:23 +01:00
kittenchilly
7409b87d17
Add merged placeholder text for trainer name with class (#5622) 2024-11-10 21:21:27 -03:00