Sadfish the Sad
64887ee876
dark void, clangorous soulblaze, vortex animation fixes ( #5650 )
2024-11-25 19:57:22 +01:00
Alex
612c8d3ff6
Fixes heal blocked leeach seed in tests ( #5700 )
2024-11-21 17:18:44 +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
67c7106fee
Refactors Absorb to use Moveend ( #5670 )
2024-11-17 09:59:04 +01:00
hedara90
a06dc03207
Fixed curse + Protean interaction ( #5663 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-11-12 19:18:37 +01: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
Eduardo Quezada
e005ffb576
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-06 10:01:48 -03:00
Alex
8581646c22
Convert 3 variouses to callnatives ( #5646 )
2024-11-06 10:09:49 +01:00
Alex
dc740b4e9a
Fixes Magic Coat message ( #5645 )
2024-11-06 10:09:00 +01:00
Eduardo Quezada
afa7ab9b2e
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-24 07:47:52 -03:00
ghoulslash
6de4222c22
Fix AnimTask_HorizontalShake uses for shaking screen in battle anims ( #5562 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-22 16:24:48 +02:00
kittenchilly
db24128ee3
Update battle messages to Gen 5+ standards ( #3240 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-21 14:52:45 -03:00
Eduardo Quezada
3205f377d5
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-21 08:18:44 -03:00
Eduardo Quezada
495de8d182
Fix Follow Me failing in Single Battles for Gen 6/7 config ( #5542 )
2024-10-19 13:59:49 -03:00
ghoulslash
d487bd0548
Revival Blessing fixes + Using Lunar Blessing's animation ( #5490 )
...
* revival blessing fixes, add anim
* fix lunar blessing anim
* Added support for Revival Blessing in tests
* Added test to confirm absent flag fix
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-19 11:34:58 -03: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
AlexOn1ine
d044f53c72
Adds tests and Costar fix from PR #5526
2024-10-16 10:51:41 +02:00
ghoulslash
1cdc91ce53
Add Costar Tests, Download Test for Doubles ( #5526 )
...
* add download double battle test
* fix costar and add test
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-16 10:44:01 +02:00
Eduardo Quezada
9ed153ff93
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015
2024-10-15 22:22:52 -03:00
Eduardo Quezada
80447bee8e
Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015
2024-10-15 20:56:56 -03:00
GriffinR
a0be2cbf7b
Fix Fallorbor typo
2024-10-12 23:50:12 -04:00
Eduardo Quezada
0a4b3a8dd7
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-12 16:23:27 -03:00
Bassoonian
8dba27249c
Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210
2024-10-12 18:41:33 +02:00
Ariel A
e10005010e
Merge branch 'followers' into followers-expanded-id
2024-10-12 12:27:05 -04:00
Ariel A
d80190fe10
fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh
2024-10-12 12:23:18 -04:00
psf
0ef3f7dedd
Merge branch 'upcoming' into scriptCommands
2024-10-11 16:27:02 -07:00
kittenchilly
130d6042e0
Add Ion Deluge animation ( #5467 )
2024-10-10 22:37:57 +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
psf
0dcb28ba0e
Add OW_UNION_DISABLE_CHECK and OW_FLAG_MOVE_UNION_ROOM_CHECK ( #5448 )
...
* First addition of both checks
* Updated config file
* fixed spacing
* Updated spacing
* Fixed issues where feature was always on
* Update overworld.h
fixed spacing per https://github.com/rh-hideout/pokeemerald-expansion/pull/5448#discussion_r1789647611
2024-10-07 17:07:23 +02:00
Eduardo Quezada
0f8b2a1ba8
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
2024-10-04 10:23:58 -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
58aa1e0034
Merge branch 'upcoming' into scriptCommands
2024-09-30 06:57:54 -07:00
Alex
42c43a3f8f
Adds Commander and Order Up ( #5246 )
...
* Adds Commander
* review points
* new line
* correction
* regression / double targeting still broken
* fix wrong target order
* transform fixes
* haze test
* fixes, tests
* bring back wrongly removed else if case
* Eject Pack / Button test + fix
* red card fix
* test fixes
* Fixes Tatsu being hit by multi hit move
* change transform check
* fix test + revert change
* Fix Tatsugiri attacking after freed up from Dozo in the same turn
* Dragon Darts tests
* fix test
* review comments
* assumtion in wrong file
* Order Up test fixes
---------
Co-authored-by: hedara90 <90hedara@gmail.com>
2024-09-29 22:45:50 +02:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03:00
PhallenTree
e67d5a23ed
Adds some Snatch interactions, fixes for Dragon Darts, Trace, Primal Reversion, Protosynthesis/Quark Drive ( #5430 )
...
* Fixes Electrified Dragon Darts sometimes targeting battlers with absorbing abilities (Volt Absorb, Motor Drive)
* Add Snatch interactions with Dancer, Swallow
* Trace fix + cleanup
* Simplify Quash
* Fixes multiple mons with Primal Reversion causing only one Primal Reversion, add tests
* Fix Booster Energy Ability Popup
* Accidentally removed healing from Swallow
* More Trace cleanup
2024-09-24 18:40:44 +02:00
Bassoonian
60e2c0f859
Merge item description branch history ( #5419 )
...
* Recreated ghoul's item_desc_header branch
Fixed tabs vs spaces
Fixing whitespace
* Fixed item in header not showing on maximum flash level
* Fixed item icon being affected by thunderstorms
* Shops now set the obtained item flag.
* Fixed build
* fix seashore house
* better soda pop fix, thx asparagus
* fix item icon showing in battle pyramid
* fix hiding item desc in battle pyramid
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-09-22 12:05:45 +02:00
ghoulslash
d695a6240d
Convert settotemboost command to callnative ( #5418 )
...
* settotemboost use callnative
* Update src/battle_main.c
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-22 11:25:42 +02:00
Frank DeBlasio
1ba0875654
Removed FRONTIER_BRAIN_SPRITES and updated TRAINER_SPRITE, TRAINER_BACK_SPRITE, and TRAINER_CLASS ( #5166 )
...
* Removed FRONTIER_BRAIN_SPRITES
* Updated TRAINER_SPRITE and TRAINER_BACK_SPRITE
* Updated TRAINER_CLASS macro
* Removed FRONTIER_BRAIN_TEXTS
* Turned Frontier Brain text to COMPOUND_STRINGs
* Removed frontier_brain.inc from event_scripts.s
* Addressed front sprite comment
* Addressed backsprite comments
2024-09-22 09:54:01 +02:00
kleenxfeu
16e8be1233
Mega evolution animation is a little smoother ( #4816 )
...
* Smoother primal/mega animation
* Just to make the CI run. It needs to run
* Update src/battle_anim_effects_3.c
---------
Co-authored-by: kleeenexfeu <94004034+kleeenexfeu@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-21 23:47:19 +02:00
Bassoonian
8ba96fdac4
Add OW_AUTO_SIGNPOST and associated metatile behaviors ( #5044 )
2024-09-21 20:39:07 +02:00
ghoulslash
4cd23a377d
anger shell use saveattacker ( #5409 )
...
* anger shell use saveattacker
* tabs instead of spaces
* add BattleScript_RestoreAttackerButItFailed for anger shell failure
* Update data/battle_scripts_1.s
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-20 18:19:45 +02:00
Alex
6ef36837e9
Fixed corruption of the next turn used move caused by Scale Shot ( #5397 )
2024-09-18 16:58:49 +02:00
Sadfish the Sad
f6319d8446
new animations for many moves more details in description ( #5367 )
...
New: Me First, Zippy Zap, Splishy Splash, Floaty Fall, Pika Papow, Bouncy Bubble, Buzzy Buzz, Sizzly Slide, Glitzy Glow, Baddy Bad, Sappy Seed, Freezy Frost, Sparkly Swirl, Veevee Volley, Snap Trap, Astral Barrage, Burning Bulwark
Updated: Aura Sphere, Dark Void, Spirit Shackle
Fixed: Springtide Storm, Bleakwind Storm, Wildbolt Storm, Sandsear Storm, Clangorous Soul(Blaze)
2024-09-15 08:22:40 +02:00
