2630 Commits

Author SHA1 Message Date
Cafe
570c6521d9
Misc pokemon sprite fixes (#5846) 2024-12-22 18:43:24 +01:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup (#5812) 2024-12-21 19:45:50 +01:00
Eduardo Quezada
9a0b5756ca
Fix "PlantCloak" references (#5821) 2024-12-20 22:25:18 +01:00
kittenchilly
a669c4c109
New Enamorus-Incarnate sprite (#5797) 2024-12-13 15:26:12 +01:00
kittenchilly
5477033a19
Updated Ogerpon, Enamorus and Sinistcha sprites (#5793) 2024-12-09 12:51:18 +01:00
Eduardo Quezada
4635f0e0f8
Converted Stance Change to proper Form Change + Tests (#5749) 2024-12-01 22:36:25 +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
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
174177a4d5
Fixes minor move desc errors (#5728) 2024-11-28 11:17:48 +01: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
Alex
194f7644b8
Changes taget bit of Flower Shield (#5698) 2024-11-23 12:02:40 -05:00
Eduardo Quezada
b2ef363ac8 Merge branch '_RHH/master' into _RHH/upcoming 2024-11-19 14:19:53 -03: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
Eduardo Quezada
e005ffb576 Merge branch '_RHH/master' into _RHH/upcoming 2024-11-06 10:01:48 -03:00
Bassoonian
6d38e260d6 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5nov 2024-11-05 10:31:40 +01:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences (#5595) 2024-10-29 15:38:26 +01:00
Alex
76eae8ed00
Decouple Poke Ball ids from item ids (#5560) 2024-10-28 18:03:15 +01:00
Eduardo Quezada
e8b8ca19a9 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-28 12:13:55 -03:00
Eclipse
5b5ecaa6ee
Fixed some gba sprites (#5607) 2024-10-28 09:22:07 -03:00
Eduardo Quezada
3442b09852
Renamed folders and symbols to match species defines (#5581) 2024-10-27 20:15:11 +01:00
hedara90
c6ccc29c93
Fixed 64px uncompressed followers (#5601)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-27 11:24:40 -03:00
Eduardo Quezada
afa7ab9b2e Merge branch '_RHH/master' into _RHH/upcoming 2024-10-24 07:47:52 -03:00
RavePossum
afc89f53b0
Fix weather genie move anims and springtide storm targets (#5553) 2024-10-22 16:27:10 +02:00
Frank
544b76fbbf Added value for bard sound length 2024-10-21 09:04:42 -04:00
Eduardo Quezada
59e617b16d
Updated Wring Out effects to match Eruption effects (#5549) 2024-10-20 21:44:28 +02:00
Eduardo Quezada
358c0d0699
Added back GBA sprites via config (#5206)
* Add back older sprites

* Graphics config

* Added GBA most graphical data to gSpeciesInfo

* Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files

* GBA mon icons

* Split GBA footprints into separate config

* Separated GBA icons into their own config

* Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS

* Moved GBA sprites to regular folder with prefix

* Renamed configs

* Temporarely disabled shadows when GBA sprites are enabled

* Removed remaining files from pokemon_old folder
2024-10-18 13:37:00 +02:00
Bassoonian
3077592e68
Pret merge 2024-10-15 (#5527) 2024-10-17 09:00:18 +02:00
Eduardo Quezada
ee9c6d4912 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-17 00:16:01 -03:00
Eduardo Quezada
e230f379b3
Fixed 10,000,000 Volt Thunderbolt name (#5533) 2024-10-16 17:46:40 -03:00
Bassoonian
d4387d880c
Replace hardcoded flute check with consumability check (#5508) 2024-10-16 12:07:34 +02:00
Eduardo Quezada
9ed153ff93 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015 2024-10-15 22:22:52 -03:00
Eduardo Quezada
0a4b3a8dd7 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-12 16:23:27 -03:00
kittenchilly
743dc4d765
Add text fitting tests for move, ability, item, and pokedex descriptions (#5505) 2024-10-12 19:37:11 +02:00
PhallenTree
8d2d62273b
Updated ability popups for Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, fix Doodle/Role Play bugs (#5493)
* Updated ability popups of Skill Swap, Mummy/Lingering Aroma, Worry Seed, Simple Beam, Fix Doodle and Role Play issues

* More Doodle fixes

* Add tests

* Fix Doodle not activating if partner is fainted and its ability cannot be suppressed

* Fix tests compile

* Commander cantBeOverwritten

* Add battle script for Overwrite then Regular ability
2024-10-10 18:36:01 +02:00
SonikkuA-DatH
708f64247f
Heart Swap Move Animation (#5460) 2024-10-09 10:43:04 +02:00
Eduardo Quezada
ee00c251ae Merge branch '_RHH/master' into _RHH/upcoming 2024-10-08 14:52:12 -03:00
hedara90
f8f4fc9afd
Removed old checksum matching workaround (#5480)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-08 14:02:31 +02:00
Eduardo Quezada
a7fca616b0 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-04 14:28:13 -03:00
wiz1989
6f59d26753
updated Conversion 2 mechanics to 5+ (#5453)
* updated Conversion 2 mechanics and added the toggle B_UPDATED_CONVERSION_2

* fixes and added new test cases

* bugfixing and added EWRAM u16 gLastUsedMoveType

* update after Pawkkie review

---------

Co-authored-by: wiz1989 <wiz1989@LAPTOP-8Q3TPMGC.localdomain>
2024-10-04 12:42:15 -04:00
kittenchilly
19009c6d21
Add support for overworld sprite gender differences + add all the sprites (#5394) 2024-10-04 17:56:21 +02:00
Eduardo Quezada
0f8b2a1ba8 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909 2024-10-04 10:23:58 -03:00
Eduardo Quezada
80af2af9ad Merge branch '_RHH/master' into _RHH/upcoming 2024-10-03 14:33:01 -03:00
kittenchilly
44bf14e6fd
Add functionality to Poké Flute and Town Map (#5405)
* Add functionality to Poké Flute and Town Map

* Poke flute in-battle

* Address reviews

* Update item_use.c

* Update battle_message.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c

* Update battle_script_commands.c
2024-10-03 10:52:59 +02:00
psf
2597d8a35a
Updated species defines (#5075)
* First version of new defines

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Fixed cloaks

* Removed old defines

* Removed old defines

* Removed old defines and cleaned up some macros

* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs

* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599

* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
2024-10-02 18:24:57 -03:00
kittenchilly
a135876dc0
Remove trailing whitespace pass 10-2-2024 (Upcoming) (#5456) 2024-10-02 21:20:23 +02:00
kittenchilly
d5560bbc87
Remove trailing whitespace pass 10-2-2024 (Master) (#5455) 2024-10-02 21:20:02 +02:00
Bassoonian
5a8a393dcd
Add Sideways Stairs (#4836) 2024-09-30 00:06:25 +02:00