Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

572 Commits

Author SHA1 Message Date
Eduardo Quezada
d076193b9f Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	include/constants/battle.h
#	include/constants/battle_script_commands.h
#	src/battle_script_commands.c
#	src/data/battle_moves.h
 2023-12-03 16:39:32 -03:00
Alex
4bde378c0d
Fixes Floral Healing + Tests (#3604) 2023-11-29 13:57:29 +01:00
Nephrite
2d0ec53cb6 Misc moves + cmd_seteffectwithchance fix 
Added check to prevent loops in cmd_seteffectwithchance. Updated Pay Day, Tri Attack, Spectral Thief, Clear Smog, V Create, Core Enforcer
 2023-11-27 00:32:40 +09:00
Nephrite
4058d16f2f 2-Turn moves + unique moves with secondary effects 
Two turn moves (Bounce, Freeze Shock, Sky Attack, Shadow/Phantom Force), Dire Claw, Stone Axe, Ceaseless Edge, Wicked Torque, Relic Song, Fake Out,
 2023-11-25 23:56:17 +09:00
Nephrite
0e23160f2e Fixed macro + Jaw Lock test 2023-11-25 23:06:51 +09:00
Nephrite
98b2c93b3f Freeze/frostbite causing moves 
Added move effect FREEZE_OR_FROSTBITE macro so that we only need that if statement once...
 2023-11-25 19:22:28 +09:00
Eduardo Quezada
c8b0545d20 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	include/battle.h
 2023-11-25 00:51:33 -03:00
Nephrite
5eae07e4b9 Jaw Lock, Axe Kick, Spin Out 
Jaw Lock needs a test but I'm too lazy to write it
 2023-11-23 23:43:11 +09:00
Nephrite
d81bf6afde EFFECT_POISON_HIT 
Also tidied up paralysis/burn scripts; updated Barb Barrage
 2023-11-23 22:29:11 +09:00
Nephrite
bec0fea7f6 Flinching moves 
All work fine - all tests pass
 2023-11-23 17:14:50 +09:00
Alex
ca39889587 Fixes Howl 2023-11-22 21:55:08 +01:00
Nephrite
ffe89c7248 Redid Fang Moves 
Pass tests too
 2023-11-23 00:21:57 +09:00
Alex
7fb811d33d burn_hit -> move_effect_burn 2023-11-22 19:24:32 +09:00
Alex
ba6d223f17 matcha gotcha 2023-11-22 19:20:30 +09:00
Alex
b9edbb429b
Adds combined pledge move effects (#3336) 
* Adds combined pledge move effects

* added pledge status and various other fixes

* leftover

* fix triple arrow test tag

* pledge moves can not be redirected by absorbing abilities

* more pledge changes

* remove duplicate test

* Stab boost, Rainbow anim and new SeaOfFire anim

* leftover

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-21 16:23:22 +01:00
Alex
be42d4eafb
Increase score of secondary effects only at 100% chance (#3583) 
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-21 11:30:20 +01:00
Nephrite
1dadc79b8b Triple Arrows redo 
Sorry, Lunos
 2023-11-20 19:39:13 +09:00
Alex
4cb03d4add
Adds Raging Bull and various fixes (#3552) 
* Adds Raging Bull and various fixes

* fix compiling on abgcc

* syrup bomb anim fix

* sticky syrup anim in link battles

* fix sticky syrup in link battles

* fix battler index

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-19 17:45:58 +01:00
Nephrite
45d8491148 Fixed macro + implemented working Mortal Spin 
It's that easy
 2023-11-19 05:05:19 +09:00
Nephrite
41202a964a Initial struct change + paralysis test 
Works great
 2023-11-19 03:20:33 +09:00
Alex
5fa1bffa8d
Adds Glaive Rush, fixes for Plasma Fists and Relic Song (#3476) 
* Adds Glaive Rush

* Fixes: Glaive Rush status is removed until users next turn

* Glaive Rush no affect

* simplify glaive rush script

* simlify script further

* leftover

* Fix Plasma Fists and Relic Song + tests

* Callnative for Plasma Fists

* Use Status Field Ion Deludge for Plasma Fists

* add assumes for flinch_status

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2023-11-18 15:19:38 +01:00
LOuroboros
efe9f6d8ab
Added battle tests for Embargo (#3555) 
* Added Embargo battle tests

* Expanded Embargo doesn't prevent Primal Reversion to avoid CI failure

* Applied corrections to some of the Embargo tests
 2023-11-17 13:14:37 +01:00
Eduardo Quezada
57c1dd97bb Merge branch 'RHH/master' into RHH/upcoming 2023-11-03 21:59:08 -03:00
DizzyEggg
7eb1b12224
Fix Knock Off healing berries (#3509) 2023-11-01 14:47:31 +01:00
Eduardo Quezada
908af87846 Merge branch 'RHH/master' into RHH/upcoming 2023-10-30 11:00:24 -03:00
DizzyEggg
f4be01f0ac
Fix strength sap on substitute (#3486) 
* tests for strenth sap

* fix strength sap on substitute

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2023-10-30 11:58:15 +01:00
DizzyEggg
0c8fdce1a4
New tests + Sheer Force / Last Resort minor bug fixes (#3378) 
* tests for intimidate defiant

* sheer force fix + tests

* white herb tests

* tests for stealth rock, weak armor and last resort fix

* style changes to weak armor test
 2023-10-30 11:39:41 +01:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A (#3474) 2023-10-27 19:14:45 -03:00
kittenchilly
9d2be9f3a6
Remove all trailing whitespace (upcoming) (#3473) 2023-10-27 13:54:55 -03:00
kittenchilly
bd71946372
Remove all trailing whitespace (master) (#3472) 2023-10-27 13:52:44 -03:00
Alex
25a57d48d9 fixes tests 2023-10-25 10:18:59 +02:00
Alex
f6781a77d4 merge rhh/upcoming 2023-10-25 09:42:19 +02:00
Martin Griffin
74c08dc955 Merge remote-tracking branch 'rhh/master' into upcoming 2023-10-24 08:58:02 +01:00
Martin Griffin
5fe564f014
Detect 'NOT x; NOT y;' (#3459) 
Fix Purifying Salt to be immune to statuses from secondary effects.
 2023-10-24 09:55:32 +02:00
Eduardo Quezada
1137d54b61 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	asm/macros/battle_script.inc
#	src/battle_script_commands.c
 2023-10-23 17:36:42 -03:00
LOuroboros
cd59e055c2
Made Reflect Type handle 3rd types (#3303) 
* Made Reflect Type handle 3rd types

Misc:
-Turned VARIOUS_TRY_REFLECT_TYPE into a callnative (BS_TryReflectType)
-Introduced a macro to to check for typeless Pokémon (Pokémon who have Mystery in all 3 type slots) in battle.
-Made the new BS_TryReflectType take into account the forms for Arceus and Silvally, rather than just their default form.
 2023-10-23 10:08:36 +01:00
Eduardo Quezada
bcf0377d9a Merge branch 'RHH/master' into RHH/upcoming 2023-10-22 16:30:26 -03:00
Eduardo Quezada D'Ottone
77e2b0dd2c
Test cleanup and improvements (#3449) 
* Fixed duplicated test names

* Test improvements for Jaboca, Kee and Rowap Berries

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Lansat Berry test improvements

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Jaboca Berry/Bug Bite interaction test

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2023-10-22 21:22:59 +02:00
Eduardo Quezada
a34c260169 Merge branch 'RHH/master' into RHH/upcoming 2023-10-21 23:59:33 -03:00
Alex
783ec0e957 fixes tests 2023-10-22 01:03:10 +02:00
Alex
0a6c0261fe
Fixes Make it Rain in double battles (#3441) 2023-10-21 23:42:19 +02:00
kittenchilly
33a0fdbbc6
Add new move flags and update all flags for every move (#3425) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-19 20:16:37 -03:00
Eduardo Quezada
6348c24be1 Merge branch 'RHH/master' into RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
 2023-10-19 08:10:49 -03:00
Alex
ceb6beb254 merge upcoming 2023-10-19 12:30:55 +02:00
Alex
91b6722322 Octolock, more tests 2023-10-18 20:25:34 +02:00
kittenchilly
28c6a1af49
More weather and type-specific tests (#3260) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-10-14 22:58:31 -03:00
Eduardo Quezada
3409869f9c Merge branch 'RHH/master' into RHH/upcoming 2023-10-13 17:44:43 -03:00
DizzyEggg
a7b9d139da
Fix Wall Werrors on modern (#3412) 
* Fix Wall Werror errors

* fix hgss pokedex modern errors

* tests build on modern

* learnset change

* Update src/battle_ai_util.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/battle_anim_new.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/debug.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* Update src/pokedex_plus_hgss.c

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>

* review changes

* unused cmd args

* various args back

---------

Co-authored-by: Philipp AUER <SBird1337@users.noreply.github.com>
 2023-10-13 18:39:35 +02:00
Alex
6ed8ab771b Fix Syrup Bomb and change Octolock 2023-10-13 14:08:44 +02:00
Martin Griffin
f5b149b971
Test improvements (#3408) 
* Run assumptions on all runners

* Make i const in battle tests

This avoids the pitfall of using i in a PARAMETRIZEd test and confusing
the runner.
 2023-10-12 12:14:07 +02:00