Commit graph

331 commits

Author SHA1 Message Date
Eduardo Quezada
1bd1e934f1
Comment out Ally Switch Illusion test (#5901) 2024-12-29 17:52:35 +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
433058edc1
Added missing Move Effect TODO tests - Volume D (#5887) 2024-12-29 14:27:08 +01:00
Eduardo Quezada
dccf2632b2
Added missing Belch tests (#5881) 2024-12-27 11:16:30 +01:00
Eduardo Quezada
2c9352921c
Fixed Ally Switch breaking Illusion (#5879) 2024-12-26 21:04:03 +01:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup (#5812) 2024-12-21 19:45:50 +01:00
Bassoonian
5cc0b35d81
Replace power checks with IS_MOVE_STATUS (#5820)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-12-20 08:20:46 -03:00
Alex
8f59d9c94f
Fixes Shed Tail substitute health (#5826) 2024-12-18 21:39:32 +01:00
ghoulslash
11bc9bd2f2
Ally Switch extra battlerId tracking (#5823)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-12-18 14:39:34 +01:00
Alex
99ba36b446
Fixes Tidy Up (#5819) 2024-12-17 09:47:37 +01:00
Alex
12f199c641
Fixes absorb still draining HP when flinched (#5814) 2024-12-16 10:54:50 +01:00
Eduardo Quezada
7eee3b35c2
Added missing tests + Fix Coaching/Crafty Shield interaction (#5796)
Co-authored-by: hedara90 <90hedara@gmail.com>
2024-12-11 09:05:09 +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
Eduardo Quezada
3882578a33 Merge branch '_RHH/pr/master/1.9.4' into _RHH/pr/master/1.10.0 2024-12-01 15:06:02 -03:00
iriv24
1dde42c0cc
Cant't knock off Rusted Shield/Sword from Zamazenta/Zacian (#5750) 2024-12-01 16:37:46 -03:00
Alex
194f7644b8
Changes taget bit of Flower Shield (#5698) 2024-11-23 12:02:40 -05:00
Alex
612c8d3ff6
Fixes heal blocked leeach seed in tests (#5700) 2024-11-21 17:18:44 +00:00
Alex
3cc048cc01
Removes redundant Decorate check (#5696) 2024-11-21 00:13:31 -05:00
Alex
572ea141af
Fixes Absorb regression caused by #5670 (#5688) 2024-11-19 14:56:34 -05:00
Eduardo Quezada
5fe39f6019 Fixed incoming master tests 2024-11-19 14:34:20 -03:00
Eduardo Quezada
b2ef363ac8 Merge branch '_RHH/master' into _RHH/upcoming 2024-11-19 14:19:53 -03:00
AERDU
5388ed0cad
Mimicry updates typing with RemoveAllTerrains() (#5666)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-11-17 10:21:01 +01: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
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
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
dc740b4e9a
Fixes Magic Coat message (#5645) 2024-11-06 10:09:00 +01:00
Eduardo Quezada
5d4ab8cc7e Merge branch '_RHH/master' into _RHH/upcoming 2024-10-27 08:02:45 -03:00
Alex
ad16fa76f2
Fixes Magic Guard not preventing Salt Cure (#5583) 2024-10-26 10:11:45 +02:00
GhoulMage
be98de71d5
Fixed damage test (#5574) 2024-10-24 18:12:31 +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
59e617b16d
Updated Wring Out effects to match Eruption effects (#5549) 2024-10-20 21:44:28 +02: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
Eduardo Quezada
ee9c6d4912 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-17 00:16:01 -03:00
Alex
ed65c4a2f7
Fixes Partner targeting and Acupressure/Ally Switch interaction (#5446)
* Fixes Partner targeting and Acupressure/Ally Switch interaction

* More tests

* Update test/battle/move.c
2024-10-15 17:04:35 -04:00
Eduardo Quezada
0a4b3a8dd7 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-12 16:23:27 -03:00
ghoulslash
353915ef64
Add various tests, add RNG_RANDOM_TARGET (#5438)
* burn dmg test depends on config

* burn and frostbite tests use B_BURN_DAMAGE config for denom val

* update kings shield test with config

* add RNG_RANDOM_TARGET, use SetRandomTarget in HandleAction_UseMove target acquisition, update uproar test to PASSES_RANDOMLY since test will fail if you target the soundproof voltorb. Slightly faster UproarWakeUpCheck

* add sticky web+contrary test

* add EXPECT_EQ to contrary+sticky web test

* Update src/battle_script_commands.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Update src/battle_util.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* Update test/battle/move_effect/uproar.c

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

* fix test

* syntax fix

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-10-11 23:47:46 +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
Bassoonian
806321f3c8
Update shed_tail.c (#5494) 2024-10-09 18:24:39 +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
Eduardo Quezada
80af2af9ad Merge branch '_RHH/master' into _RHH/upcoming 2024-10-03 14:33:01 -03: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
Pawkkie
5908fbef9c
Wake-Up Slap test typo (#5442)
* Wake-Up Slap test typo

* Update test/battle/move_effect/wake_up_slap.c

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-09-29 12:34:34 -04:00