Alex
a086d5f592
Reverts wrongly done gem fix and renames struggle effect ( #6806 )
2025-05-15 10:45:48 +02:00
ghoulslash
5ad8d852fd
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into expansion/ripenfix
2025-05-13 08:01:41 -04:00
Bassoonian
60587682e3
Remove redundant script declaration in battle_scripts.h ( #6837 )
2025-05-13 10:32:03 +02:00
ghoulslash
d4c64d3b67
rename berrystatraise script to consumablestatraise
2025-05-12 21:11:25 -04:00
Alex
0ad3f929ab
Fixes Berserk Gene infinite loop ( #6813 )
2025-05-11 11:34:16 +02:00
spindrift64
f4f82f2394
Toxic Spikes print whether the target is poisoned or badly poisoned ( #6814 )
2025-05-10 22:55:28 +02:00
Alex
d220459a01
Fixes Intimidate / Eject Pack interaction ( #6645 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-21 17:33:29 +02:00
Alex
79a2ec1ce2
Fixes Emergency Exit and Eject Pack ( #6459 )
2025-03-29 14:04:01 +01:00
Alex
99a3d01877
Fixes dynamax reversion when ejected out + anim fix ( #6416 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-17 19:57:38 +01:00
PhallenTree
ddab689a07
Fixes Neutralizing Gas Exits, Weather Abilities and Terrain Effects order ( #6435 )
2025-03-16 23:10:20 +01:00
Alex
3def0e751b
Fixes crash damage move against absorbing abilities ( #6361 )
2025-03-09 20:54:58 +01:00
Alex
502b1c5087
Rename SetPhotonGeyser to a more general use and clean up ( #6272 )
2025-02-17 22:07:30 +01:00
Eduardo Quezada
3507862164
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-12 09:30:59 -03:00
Eduardo Quezada
a2ad5d2ca3
Heal Bell/Aromatherapy/Sparkly Swirl improvements and fixes ( #6210 )
2025-02-09 21:54:03 +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
Alex
765a12f520
Convert max effects to normal move effects ( #6143 )
2025-02-06 21:02:39 -03:00
Eduardo Quezada
64c5113b23
Merge branch '_RHH/master' into _RHH/upcoming
2025-02-02 14:18:13 -03:00
Alex
97d8bd2646
Fixes Dragon Tail missing timing against Rocky Helmet / Iron Barbs ( #6154 )
2025-01-31 22:02:26 +01:00
ghoulslash
03684c6539
Battle Weather Refactor ( #5833 )
2025-01-04 07:33:25 -05:00
Eduardo Quezada
a50c78bb1e
Merge branch '_RHH/master' into _RHH/upcoming
2025-01-01 18:34:42 -03:00
Alex
b7e945fbfb
Reverts wrongly done partial Eject Pack fix ( #5928 )
2025-01-01 21:41:42 +01:00
AlexOn1ine
74f1d7cb80
merge rhh/upcomig
2024-12-28 21:03:34 +01:00
AlexOn1ine
6a906a3fc1
refactor done
2024-12-28 20:55:59 +01:00
Eduardo Quezada
3bc4126558
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-28 15:28:07 -03:00
AlexOn1ine
9c34634dd6
Draft Change
2024-12-25 11:03:32 +01:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup ( #5812 )
2024-12-21 19:45:50 +01:00
PhallenTree
775ea3b564
Pursuit refactor ( #5707 )
2024-12-06 19:14:46 +01:00
Eduardo Quezada
a92350fb53
Merge branch '_RHH/master' into _RHH/upcoming
2024-12-04 18:55:56 -03:00
Alex
70224f0ea3
Fixes items preventing other switch in effects ( #5732 )
...
Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>
2024-12-03 11:15:29 -05:00
AlexOn1ine
d95dbadccc
merge rhh/upcoming
2024-12-02 19:00:55 +01:00
Pawkkie
2b7905beb1
Add B_FLAG_SLEEP_CLAUSE ( #5566 )
...
Co-authored-by: Isaac Rivera <isaacrivera2020@u.northwestern.edu>
Co-authored-by: iriv24 <40581123+iriv24@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-12-02 09:06:03 +01:00
Eduardo Quezada
0322d51887
Split "Do nothing" move effects ( #5613 )
2024-12-02 09:05:04 +01: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
Alex
67c7106fee
Refactors Absorb to use Moveend ( #5670 )
2024-11-17 09:59:04 +01:00
hedara90
1d7e4cf8fc
Cleans up Primal Reversion code ( #5659 )
2024-11-12 13:48:06 +01: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
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
Eduardo Quezada
e005ffb576
Merge branch '_RHH/master' into _RHH/upcoming
2024-11-06 10:01:48 -03:00
Alex
dc740b4e9a
Fixes Magic Coat message ( #5645 )
2024-11-06 10:09:00 +01: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
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
Alex
6ef36837e9
Fixed corruption of the next turn used move caused by Scale Shot ( #5397 )
2024-09-18 16:58:49 +02:00
PhallenTree
100c7dd8ad
Fixes Powder (status) interactions + tests ( #5370 )
...
* Simplified fix from #4638
* Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge
* Powder Tests
* Remove duplicate
* Assume Powder is a powder move
* Add config for Powder Rain interaction
* Only primal rain
* Z-Moves fix handled in Canceller_Z_Moves
* Fix BattleScript name
* Make sure Z-Move + Powder still damages user
2024-09-13 18:08:23 +02:00
PhallenTree
930cac6aca
Fix Instruct bypassing AtkCanceler, Entry Hazards targeting wrong side of the field if opponent fainted ( #5262 )
...
* Fix Instruct bypassing AtkCanceler + interaction with firstTurnOnly moves
* Fix Entry Hazards targeting the wrong side of the field if opponent fainted
* Remove unused BattleScript_AuroraVeilEnds and STRINGID_AURORAVEILENDS
* Alternative fix + Fix gBattlerTarget initially set to 2
* Fix Instruct animation
* Alternative anim fix
2024-08-27 14:46:56 +02:00
Salem
ceec17ec7b
remove unused bs signature ( #5257 )
2024-08-25 23:13:40 +02:00
PhallenTree
ec3a86dd9a
Adds in-battle effect of Pickup, adds Harvest and Pickup tests ( #5170 )
...
* Adds Harvest tests
* Adds Pickup in-battle effect + tests
* Fix G-Max Replenish test (Munchlax activates Pickup before G-Max Replenish)
* Change canPickupItem to bit field
* Make RandomUniformExcept inclusive (higher end) + convert bitfield
* Use CantPickupItem in PickupHasValidTargetc check
* Review
2024-08-16 15:37:23 +02: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
Alex
edc883d038
Refactors residual damage ( #4945 )
...
* Refactors damage non types
* correction
* Refactor weather damage script
* new line
* correction
* there was a hail test already
* ndebug
* add sandstorm test
* Update src/battle_script_commands.c
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-07-13 12:12:40 +02:00
