Commit Graph

2420 Commits

Author SHA1 Message Date
BuffelSaft
cecd341011 Fix Tar Shot
If Tar Shot can't do anything to the target it should fail. Checking this is clunky, but it works.
2021-11-04 20:47:45 +13:00
BuffelSaft
3baf2aa331 Remove trynextdart, update waitmessage 0x40
Not dealing with Dragon Darts in this PR. Updated waitmessage 0x40 to waitmessage B_WAIT_TIME_LONG.
2021-11-04 20:19:18 +13:00
BuffelSaft
28e78cb6c4 Gen 8 moves initial commit
Full credit to Nunuchu42 and cfmnephrite for this code.
2021-11-04 19:50:54 +13:00
ghoulslash
48c29a9cd8 proper mirror armor sticky web targeting 2021-11-03 15:05:52 -04:00
ghoulslash
ffcba355b0 merge w be 2021-11-02 10:36:08 -04:00
ghoulslash
b5d20da927 merge with be 2021-11-01 11:36:18 -04:00
ghoulslash
468ee66cd8 fix synthesis and leaf guard w utility umbrella 2021-10-30 11:04:50 -04:00
ghoulslash
af914ee7ed merge w be 2021-10-29 22:33:50 -04:00
ghoulslash
f342e7c590 merge with be 2021-10-28 17:03:10 -04:00
LOuroboros
82101d3581 Optimizations 2021-10-28 14:02:43 -03:00
LOuroboros
28522f3ffb Fixed Hyperspace Fury not breaking through protections
Also repositioned VARIOUS_JUMP_IF_SPECIES.
2021-10-28 12:09:44 -03:00
ghoulslash
bebaded415 merge with be 2021-10-27 16:48:38 -04:00
LOuroboros
1ab8c84f41 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury 2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists 2021-10-23 11:06:34 -03:00
LOuroboros
a6315ffc75 Implemented Plasma Fists 2021-10-19 09:50:18 -03:00
LOuroboros
d9b8e11a9c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE 2021-10-19 07:47:42 -03:00
LOuroboros
dcea8e45ed Fixed jumpifspecies 2021-10-17 10:51:55 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite 2021-10-14 19:46:50 -03:00
BuffelSaft
fc6e8f598c Merge branch 'battle_engine' into battle_bond 2021-10-14 16:24:59 +13:00
BuffelSaft
bb8d0e3d6b Fix Battle Bond
Battle Bond Greninja transforms only after a KO, and doesn't revert when switched out.
2021-10-14 16:18:11 +13:00
ghoulslash
a3d2bdc9cf merge with be 2021-10-13 18:30:53 -04:00
ghoulslash
996301d5d3 add mirror armor 2021-10-12 18:04:34 -04:00
ghoulslash
25a4da71fe remove unused macro 2021-10-12 10:37:59 -04:00
ghoulslash
bbd09fdcf7 add wandering spirit 2021-10-12 10:32:51 -04:00
ghoulslash
06bcfea3b8 merge with be 2021-10-10 19:56:33 -04:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
ghoulslash
4aeadd96c9 merge with be 2021-10-06 14:49:23 -04:00
ghoulslash
391cfabcac merge with be 2021-10-06 14:31:21 -04:00
ghoulslash
4382420dd2 merge with be 2021-10-06 13:32:59 -04:00
LOuroboros
b85b3094c8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalAbilitiesDev 2021-10-03 07:05:56 -03:00
LOuroboros
a506bf03c6 Corrected Flower Veil check 2021-10-01 02:14:46 -03:00
ghoulslash
761006a164 merge with be 2021-09-26 19:19:32 -04:00
ultima-soul
fe6a11e5ec
Update asm/macros/battle_script.inc 2021-09-23 12:26:36 -07:00
ghoulslash
767e25bfed
Update asm/macros/battle_script.inc
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-09-23 13:19:12 -06:00
ghoulslash
2f69748e0d merge with be 2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f syntax fixes. Use BlocksPrankster for perish song battle script 2021-09-23 14:35:37 -04:00
ghoulslash
13062b5a8f fix lash out, obstruct, and decorate 2021-09-22 09:43:40 -04:00
ghoulslash
0ea6c65b83 merge with be 2021-09-17 09:10:09 -04:00
ghoulslash
b916d7991c merge with be 2021-09-16 21:52:29 -04:00
ghoulslash
af8d86f0c9 merge with be 2021-09-16 13:33:35 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
9c94eb6140 but it failed check for rototiller 2021-09-16 10:24:32 -04:00
ghoulslash
aa475ab300 merge with be 2021-09-15 16:42:23 -04:00
ghoulslash
60713a8f2d fix room service activation msg, stat target 2021-09-14 12:50:36 -04:00
ghoulslash
7c53214dad merge with be 2021-09-02 15:33:42 -04:00
ultima-soul
a10a02a536
Merge pull request #1221 from ghoulslash/battle_engine
Implement Pickpocket
2021-09-02 11:33:34 -07:00
LOuroboros
9e4f33d09e Implemented Desolate Land, Primordial Sea and Delta Stream 2021-08-27 17:56:43 -03:00
ghoulslash
c7c0fbc296 merge with be, make AI CanBeStatused functions separate from general util ones 2021-08-12 13:37:53 -06:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00