Commit graph

1388 commits

Author SHA1 Message Date
Alex
b7e945fbfb
Reverts wrongly done partial Eject Pack fix (#5928) 2025-01-01 21:41:42 +01:00
ghoulslash
ca31145d36
Fix Salt Cure script (#5895)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-12-29 16:51:33 +01:00
Eduardo Quezada
e883b7c251
Fixed Wish triggering Disguise (#5860) 2024-12-22 23:39:17 +01:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup (#5812) 2024-12-21 19:45:50 +01:00
kittenchilly
c3133193e2
Fix Hit Escape moves giving Exp to the mon that switches in (#5844) 2024-12-21 10:30:25 +01:00
PhallenTree
742f7a4875
Fixes Cotton Down and Gulp Missile not interacting correctly with stat reduction prevention effects (#5841) 2024-12-20 22:24:23 +01:00
Alex
b22a867e11
Fixes Room Service (#5827) 2024-12-19 14:12:01 +01:00
Alex
99ba36b446
Fixes Tidy Up (#5819) 2024-12-17 09:47:37 +01:00
iriv24
cb12bdc220
Fix No Guard failing OHKO Moves into Semi-Invulnerable Pokemon (#5779)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-12-07 18:11:45 -03:00
ghoulslash
6e24b6af3d
Gravity fix + Sky Drop Test (#5780)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-12-07 14:48:01 +01:00
ghoulslash
a775098e83
Fix octolock + defiant (#5781)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-12-07 13:38:34 +01: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
Hedara
f6fdca615f Merge branch 'master' into master-to-upcoming 2024-11-29 11:32:12 +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
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
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
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
0a4b3a8dd7 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-12 16:23:27 -03: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
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
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
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
Eduardo Quezada
551c558186 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-11 07:28:02 -03:00
Eduardo Quezada
cdf781f726
Fixed Toxic Thread stat increase (#5369) 2024-09-11 11:18:58 +02:00
Alex
5089b1d0b4
Adds callnative for soundproofcheck to addtionally check the flag (#5301)
* Adds callnative for soundproofcheck to addtionally check the flag

* rename callnative, include parish song and missing ability recording
2024-09-09 06:52:26 -03:00
hedara90
d62b7270c8
Fixed trainerslide arguments (#5344)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-09 10:49:05 +02:00
Eduardo Quezada
8533b0c045 Merge branch '_RHH/master' into _RHH/upcoming 2024-09-03 14:39:50 -04:00
Alex
e09a59a7e4
Fixes Tar Shot on Tera mons (#5302)
* Fixes Tar Shot on Tera mon

* new line
2024-08-31 12:24:28 -04:00
Eduardo Quezada
aebbe448b8 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-28 12:58:14 -04: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