9b881d74a3
Merge branch 'pr/243'
2024-04-29 11:17:14 -04:00
e1071615a3
Merge branch 'pr/241'
2024-04-29 11:16:15 -04:00
9dd806f775
Merge branch 'pr/240'
2024-04-29 11:15:24 -04:00
6ecddc4bc7
Merge branch 'pr/238'
2024-04-29 11:13:53 -04:00
28739c30fb
Merge branch 'pr/235'
2024-04-29 11:10:18 -04:00
e45fb0419f
Merge branch 'pr/232'
2024-04-29 11:09:36 -04:00
e709074211
Merge branch 'pr/227'
2024-04-29 11:07:14 -04:00
6e26025a1c
Merge branch 'pr/221'
2024-04-29 11:06:33 -04:00
87b2684328
Merge branch 'pr/205'
2024-04-29 10:59:50 -04:00
fab5d70ac9
Merge branch 'pr/202'
2024-04-29 10:58:42 -04:00
af32b54764
Merge branch 'pr/168'
2024-04-29 10:56:23 -04:00
58e9edd014
Merge branch 'pr/166'
2024-04-29 10:55:04 -04:00
9ddb9920c3
Merge branch 'pr/116'
2024-04-29 10:53:45 -04:00
b173000008
Implement Alcremie flavors
...
...But not all evolution sweets. This way, you can get all the differently colored Alcremies without there being like ~60 different forms.
There currently is an unintended side-effect with Gigantamaxing, where the Alcremie flavor will always switch to Vanilla Cream when reverting to normal, but aside from that, it works fine.
2024-04-29 01:42:02 -05:00
3731f943a8
Merge branch 'main' into main
2024-04-28 23:54:20 -06:00
7050e0db6c
Fixed Outrage etc. lasting 4 turns
2024-04-28 23:57:40 -04:00
481d8e2796
removed redundant condition
2024-04-28 23:49:26 -04:00
696c31f3e2
Make grass types unable to be seeded
2024-04-28 23:33:13 -04:00
b72b4cffed
Implement Furfrou forms
...
They can be randomly encountered like many other multiple form Pokémon. Like canon, they do not have any statistical changes, just cosmetic.
2024-04-28 21:58:55 -05:00
6f078f4645
Minor fix to Roughneck's possible names
2024-04-28 20:02:06 -05:00
03ba74844f
Fix biome being able to change before a boss in endless
2024-04-26 23:53:09 -04:00
e362289d57
Implement Spirit Shackle
...
It's a pretty basic trapping attack
2024-04-26 20:40:28 -05:00
2cb5aad8b1
Mark Core Enforcer as partial
...
No coding for it yet, but it can function as a regular attack in the meantime.
2024-04-26 20:01:24 -05:00
e475d566b6
Revise egg moves again
...
These revisions spans across all generations with vastly different moves. Once again, if moves seem weird or too overpowered, please bring it up in the egg move discussion thread.
2024-04-26 18:50:14 -05:00
85edb32c06
Merge branch 'main' into teatime
2024-04-26 15:40:12 -04:00
65183d6eb9
simplified test condition further
2024-04-26 15:22:31 -04:00
e68044436f
removed print debug + unnecessary logic
2024-04-26 15:21:00 -04:00
a6c27773f8
Make arena trap count as a lure ability ( #245 )
2024-04-26 13:58:57 -04:00
dd76667e2a
Merge branch 'main' into terrainpulse
2024-04-26 13:28:24 -04:00
f9b999b744
spacing
2024-04-26 12:18:01 -04:00
def36e32d1
adds missing brackets to psycho shift attribute to fix unreachable condition
2024-04-26 12:16:56 -04:00
310ad59def
fixed grounded check
2024-04-26 11:31:40 -04:00
e18f5f972b
check if max
2024-04-26 09:14:36 -04:00
5c4d299de1
Merge branch 'main' into implements-cursed-body
2024-04-26 09:13:29 -04:00
46227d65f2
Fix mind blown/explosion moves
2024-04-26 08:33:29 -04:00
587197dac4
Fixed entry hazard crash
...
Having Spikes or Stealth Rock on the field when a new wild battle starts no longer crashes the game.
2024-04-26 00:59:20 -04:00
d4c265443f
Assurance effect implementation
...
Theoretically implemented for all use cases but only tested for regular damage so far.
2024-04-25 23:03:00 -04:00
9f3bef0142
Implemented explosive moves and Damp ( #290 )
...
* Implemented explosives
* Add Aftermath and Magic Guard interactions
* Adjust AI score for Mind Blown/Steel Beam
2024-04-25 21:42:41 -04:00
e3533651ba
Add form change items for Deoxys; minor Rotom form learnset changes
...
Adds 3 separate form changing items to switch between the various Deoxys forms.
All Rotom forms can now know their respective typed moved at the start (and can be relearned via Memory Mushroom if you already have one).
2024-04-25 20:26:09 -05:00
728512cf7d
Fix Baton Pass not working
2024-04-25 20:52:52 -04:00
1838e50248
Merge branch 'pagefaultgames:main' into main
2024-04-25 15:43:14 -06:00
fa463b77db
Implements Stakeout & Analytic ( #292 )
...
* implemented stakeout
* implemented analytic
2024-04-25 14:29:05 -04:00
382f1a8d78
Styling changes
2024-04-25 04:01:00 -04:00
413591ce70
Merge branch 'main' into main
2024-04-24 23:58:12 -06:00
7032f383ea
Fix battle sprite losing shininess in battle animations
2024-04-25 01:49:06 -04:00
230c2bf983
Fix Moody and Quark Drive ( #284 )
...
* Fix Quark Drive and Moody
* Telepathy still unimplemented
* more merge conflict stuff
2024-04-25 01:23:45 -04:00
a762101f64
fixing merge conflicts
2024-04-25 01:07:08 -04:00
8d0a868dbe
Merge branch 'main' into quickdraw
2024-04-25 01:00:23 -04:00
608a9d9400
Merge pull request #242 from EggMuncherSupreme/main
...
Added the triageMove() flag to Bouncy Bubble
2024-04-24 23:18:46 -05:00
1bfd601f4c
More merge conflict grrrrrr
2024-04-24 23:06:03 -04:00
Chacolay
Madmadness65
NxKarim
AJ Fontaine
lucfd
Xavion3
Flashfyre
Luc
Akuma-Reiki
shayebeadlingkl
InfernoVulpix
AJ Fontaine
maru
Tempoanon
Madmadness65
Temps Ray