3390 Commits

Author SHA1 Message Date
BuffelSaft
07bdd2ffe6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-10-09 15:18:51 +13:00
BuffelSaft
fbc4d7584e
Merge pull request #1610 from LOuroboros/primalAbilities
Implement Desolate Land, Primordial Sea and Delta Stream
2021-10-08 20:01:09 +13:00
ghoulslash
1f4844c7f5
Merge pull request #1710 from AsparagusEduardo/BE_Struggle
Implemented modern effect of struggle with config
2021-10-06 09:27:10 -04:00
ghoulslash
245ef1ad2d
Merge pull request #1715 from AsparagusEduardo/BE_ShadowTag
Config for Shadow Tag vs Shadow Tag
2021-10-06 09:02:58 -04:00
LOuroboros
2b32581c14 Fixed infinite loop 2021-10-06 09:27:33 -03: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
Eduardo Quezada D'Ottone
978f73475b Config for Shadow Tag vs Shadow Tag 2021-10-02 19:01:11 -03:00
Eduardo Quezada D'Ottone
57ea20bc6d Implemented modern effect of struggle with config 2021-10-02 13:32:36 -03:00
LOuroboros
c464b1b5dd STRINGID_ATTACKERBECAMEASHGRENINJA -> STRINGID_ATTACKERBECAMEASHSPECIES 2021-10-01 23:12:59 -03:00
LOuroboros
f3ded43a88 Implemented Battle Bond 2021-10-01 22:49:17 -03:00
LOuroboros
1b039062da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-09-25 22:20:34 -03:00
Syreldar
4c05520bf3 Fixed Retaliate's naming. 2021-09-24 16:02:26 +02: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
BuffelSaft
530998c4b7 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2021-09-23 16:41:35 +12:00
BuffelSaft
2f03ac31b9 Multihit refactor and Parental Bond
Port multihit system from the CFRU, implement Parental Bond, refactor certain moves as required and implement all remaining multi hit moves except Dragon Darts.
2021-09-23 14:31:21 +12:00
Eduardo Quezada D'Ottone
2c66aa84b6
Merge pull request #1378 from ghoulslash/gen8_move_effects
Several Gen 8 Move Effects
2021-09-22 22:48:29 -03:00
ghoulslash
9bf2ffe459 fix lash out stat fell 2021-09-22 21:15:02 -04:00
ghoulslash
d738297f24 merge with be 2021-09-22 16:26:09 -04:00
ghoulslash
3559a1b8e6 fix prankster + magic coat 2021-09-22 16:09:23 -04:00
ghoulslash
1309eea8ec Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects 2021-09-22 09:43:48 -04:00
ghoulslash
13062b5a8f fix lash out, obstruct, and decorate 2021-09-22 09:43:40 -04:00
ghoulslash
fc84ebbd3e redo prankster checks to handle assist 2021-09-22 08:06:42 -04:00
sbird
0ee13418dc [ai] use expected value move dmg calculation 2021-09-22 13:15:43 +02:00
Eduardo Quezada D'Ottone
287ffff2e2
Merge branch 'battle_engine' into burmy-form-change 2021-09-21 22:34:37 -03:00
Eduardo Quezada D'Ottone
f338813c6a
Merge pull request #1538 from DizzyEggg/double_onemon_battles
Support for double battles with only one pokemon
2021-09-20 23:40:08 -03:00
ghoulslash
0ea6c65b83 merge with be 2021-09-17 09:10:09 -04:00
ghoulslash
faa963fd04 merge with be 2021-09-17 09:07:38 -04:00
ghoulslash
b916d7991c merge with be 2021-09-16 21:52:29 -04:00
ghoulslash
e756b0accc merge with be 2021-09-16 21:41:29 -04:00
ghoulslash
c2e0990aab fix some merge conflicts 2021-09-16 13:29:36 -04:00
ghoulslash
9d8672e3df merge with be 2021-09-16 13:12:59 -04:00
ghoulslash
ac42b19de7 some formatting fixes 2021-09-16 11:54:27 -04:00
ghoulslash
85f3982fb9 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into prankster 2021-09-15 17:52:45 -04:00
ghoulslash
f61d516aad some syntax/format fixes 2021-09-15 17:15:50 -04:00
ghoulslash
845e333ba1 fix electric/misty terrain interactions with yawn/rest failures 2021-09-15 17:11:42 -04:00
ghoulslash
aa475ab300 merge with be 2021-09-15 16:42:23 -04:00
ghoulslash
0bca01cb74 mental herb fixes 2021-09-15 12:56:58 -04:00
ghoulslash
b85586a33a merge with be 2021-09-15 12:54:39 -04:00
ghoulslash
c4ce4c150d fix eject pack 2021-09-14 15:38:16 -04:00
ghoulslash
55c3e152cf replace some BufferStatChange, fix room service and terrain seeds 2021-09-14 15:07:15 -04:00
ghoulslash
60713a8f2d fix room service activation msg, stat target 2021-09-14 12:50:36 -04:00
ghoulslash
95af97593b fix some comment styling. fix throat spray for multi-target moves 2021-09-14 11:53:35 -04:00
ghoulslash
f3f26d1a6f merge with be 2021-09-13 19:40:28 -04:00
ghoulslash
6915b029bd fix echoed voice power boost 2021-09-09 11:15:58 -04:00
ghoulslash
d7938bc2dc Merge branch 'prankster' of github.com:ghoulslash/pokeemerald into prankster 2021-09-09 09:44:25 -04:00
ghoulslash
b8a71cabd1 merge with be 2021-09-09 09:44:18 -04:00
BuffelSaft
a4b630e6b5 Fix MOVE_EFFECT_REMOVE_STATUS
Wake-Up Slap and Sparkling Aria now print the correct message when the target is cured.

Also, fix Ice Hammer's effect chance.
2021-09-07 16:34:32 +12:00
DizzyEggg
68c33895fd
Merge pull request #1622 from BuffelSaft/money-boost
Fix stacking effect on HOLD_EFFECT_DOUBLE_PRIZE
2021-09-06 11:32:53 +02:00
DizzyEggg
cdec3077b2
Merge pull request #1630 from BuffelSaft/disguise2
Fix many Disguise bugs
2021-09-06 10:32:37 +02:00