SarnPoke
987264caea
Deoxys Sprite/Animation Fixes ( #5603 )
2024-11-30 21:35:44 -03: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
kittenchilly
c4d83079a9
PokeCommunity sprites batch (October) ( #5655 )
2024-11-15 21:16:41 +01:00
Bassoonian
6d38e260d6
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge5nov
2024-11-05 10:31:40 +01:00
hedara90
c6ccc29c93
Fixed 64px uncompressed followers ( #5601 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-27 11:24:40 -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
Bassoonian
3077592e68
Pret merge 2024-10-15 ( #5527 )
2024-10-17 09:00:18 +02:00
Eduardo Quezada
e230f379b3
Fixed 10,000,000 Volt Thunderbolt name ( #5533 )
2024-10-16 17:46:40 -03:00
Eduardo Quezada
9ed153ff93
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015
2024-10-15 22:22:52 -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
hedara90
f8f4fc9afd
Removed old checksum matching workaround ( #5480 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-08 14:02:31 +02: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
Eduardo Quezada
0f8b2a1ba8
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
2024-10-04 10:23:58 -03:00
kittenchilly
d5560bbc87
Remove trailing whitespace pass 10-2-2024 (Master) ( #5455 )
2024-10-02 21:20:02 +02:00
kittenchilly
1c022f4d34
Fix Jubilife Muffin full heal effect + better full heal tests ( #5444 )
2024-09-29 17:05:54 -04:00
Alex
71dfd3e7c0
Ogerpon masks were missing their hold effects ( #5391 )
...
* Ogerpon masks were missing their hold effects
* fix wrong num
* test
* correct tests and additional fix
* added hold effect to battle debug
2024-09-19 00:25:53 +02:00
nescioquid
ac2b41ae71
Typo fixes and Growth move description change ( #5398 )
...
* changes Growth's move description to account for Gen 5+ behavior
* completes B_DIVE_BALL_MODIFIER comment
* fixes typos and incongruent spacing in various files
* Update src/data/moves_info.h
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-18 23:03:36 +02:00
Bassoonian
0b429a8649
Merrp merge (September 9th) ( #5359 )
2024-09-15 13:21:39 +02:00
Liamjd14
9d483cee5d
Enable asym for followers issue #5382 ( #5385 )
...
* Applies asym code to followers
galarian slowbro
tinkaton line
scovillain
2024-09-14 20:21:34 +02:00
hedara90
9633cefd11
Custom anim table follower macro & Farfetch'd example ( #5309 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-13 10:30:01 -03:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 ( #5336 )
2024-09-12 18:55:30 +02:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
Eduardo Quezada
002c770f07
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/master/merrpMerge
2024-09-09 13:52:34 -03:00
Eduardo Quezada
2f21073555
Fixed Tera Shift description ( #5351 )
2024-09-08 22:13:32 -04:00
Liamjd14
e9c0784dc0
Gen 9 Follower pokemon sprites ( #5304 )
...
* Gen 9 Follower Sprites
2024-09-05 22:31:14 +02:00
Ariel A
42d9f24c84
feat: added OW_MON_WANDER_WALK config option
2024-09-01 17:17:24 -04:00
PhallenTree
ac9b40a423
Fixes Max Moves ignoring absorbing abilities, G-Max Corviknight and Centiskorch names ( #5296 )
...
* Fix Max and G-Max Moves bypassing absorbing abilities
* Fix G-Max Corviknight and Centiskorch speciesName
* Remove some outdated comments
* Missing Dynamax check
* Add Max Quake and Max Overgrowth to test
2024-08-31 12:39:37 +02:00
Cafei
8053f4ab1e
Enable female Indeedee follower and improve shiny Indeedees ( #5285 )
...
Enable Indeedee female follower sprite.
Shiny improvements.
Fix front Indeedee male shading.
2024-08-29 18:14:46 +02:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers ( #5277 )
2024-08-28 11:47:08 +02:00
laserXdolphin
c406c4cc76
Fixed Ice Fang frostbite and freeze text. The frostbite and freeze texts were swapped. ( #5273 )
2024-08-27 14:33:58 +02:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces ( #5261 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 16:55:54 -07:00
Hiram Anderson
36a5c6ed4f
Basculin graphics config fix ( #5256 )
...
This fixes a compilation error that occurs if OW_POKEMON_OBJECT_EVENTS is true but P_HISUIAN_FORMS is false.
2024-08-25 10:03:33 +02:00
kittenchilly
bd38c64f29
New Garganacl and Naclstack battle sprite + various battle sprite fixes ( #5142 )
...
Garganacl, Spidops, Wattrel, Kilowattrel, Shroodle, Bombirdier, Orthworm, Veluza, Aerodactyl-Mega, Medicham-Mega, Latis-Mega, Diancie-Mega, Ponyta-Galar, Rapidash-Galar, Magearna, Landorus.
2024-08-20 20:16:32 +02:00
Pawkkie
a111ac496d
Fix typos ( #5221 )
...
Fix typos in move description of Decorate, Collision Course and Electro Drift
2024-08-20 12:44:27 +02:00
Bassoonian
c1ee43254e
Clean up defines lacking spaces
2024-08-15 19:34:56 +02:00
Eduardo Quezada
18980b20a3
Remove trailing whitespace (master) ( #5174 )
2024-08-14 19:48:20 -07:00
Sadfish the Sad
fde85e9357
some gen 9 move anims + fickle beam rework ( #5159 )
...
* new move anims + fickle beam rework
* more fickle beam changes
* removed the true for consistency
* ficklebeamboosted gets cleared now
* mortal spin and thunderclap changes
* minor mortal spin pal change
* removed hex numbers and made hard press quicker
2024-08-14 17:20:18 +02:00
kittenchilly
a4dc9a0480
Add Dowsing Machine expanded name ( #5134 )
2024-08-10 23:59:23 +02:00
Martin Griffin
a5e0738484
trainerproc: Parse line markers ( #5122 )
2024-08-08 20:12:18 +02:00
hedara90
6bbc0601a9
Fixed non-grass Ivy Cudgel breaking battle UI ( #5117 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-08 10:39:38 +02:00
Bassoonian
207129e0c8
Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into pretmerge7aug
2024-08-07 12:42:45 +02:00
Ariel A
5293e67995
Merge branch 'followers' into followers-expanded-id
2024-08-07 00:02:16 -04:00
tertu
08f8ccd9eb
Follower palette fix ( #5107 )
2024-08-06 11:52:05 -05:00
Hedara
a9492f5b1c
Fixed Xerneas
2024-08-06 16:52:42 +02:00
Hedara
29bb658d1b
Fixed some overworld palettes
2024-08-06 13:25:26 +02:00
PhallenTree
67f049fddb
Fixes Defiant interaction with Court Changed Sticky Web + Fickle Beam description ( #5093 )
...
* Fixes Court Changed Sticky Web deactivating Defiant/Competitive
* Fixes Fickle Beam's description
* Alternative fix
* Remove extra newLine
2024-08-06 10:45:30 +02:00
