Commit Graph

6878 Commits

Author SHA1 Message Date
ghoulslash
73a7800f72
Merge pull request #1272 from BuffelSaft/Batte_Engine_Only
Fix Jump Kick
2021-01-03 16:50:15 -07:00
BuffelSaft
10cf5b3673 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into Batte_Engine_Only 2021-01-04 10:55:30 +13:00
ExpoSeed
8cfdbaefeb
Merge pull request #1294 from LOuroboros/flower_gift
Added missing check to Flower Gift (offensive)
2020-12-31 18:41:50 -06:00
ExpoSeed
b7b1b26b57
Merge pull request #1289 from LOuroboros/final_gambit
Corrected Final Gambit's move data and tweaked its effect
2020-12-31 18:39:00 -06:00
ExpoSeed
24362e8bed
Merge pull request #1250 from ghoulslash/infestation
infestation between turn anim
2020-12-31 18:06:13 -06:00
ghoulslash
450ac70ab2
Merge pull request #1288 from LOuroboros/comments
Some more small battle_config.h tweaks
2020-12-23 10:27:09 -07:00
ghoulslash
0af8cab87e
Merge pull request #1283 from LOuroboros/ct_moves_data
Added the data of SwSh's Crown Tundra's moves
2020-12-21 23:13:23 -07:00
LOuroboros
3918542b3e Corrections to Final Gambit's effect's battle script
-Restored the call to resultmessage
-Corrected its behavior against Endured, Focus Banded/Sashed and Sturdy foes
2020-12-20 21:31:36 -03:00
LOuroboros
9f2dc914ba Tweaked Final Gambit's effect
-Made the user faint before the foe like in the official games
-Removed calls to resultmessage and critmessage as those were never needed by this move's effect
2020-12-19 22:12:17 -03:00
LOuroboros
0aae069db8 Made Fiery Wrath unaffected by King's Rock 2020-12-19 21:11:17 -03:00
LOuroboros
89989943b3 Added placeholders for the anims of CT's moves 2020-12-19 19:11:17 -03:00
LOuroboros
ffa35a33c1 Review corrections 2020-12-19 07:44:34 -03:00
ultima-soul
1b1b2ff0a3
Merge pull request #1281 from NamNguyenUTSA/patch-2
Allow player partner NPC's to mega evolve
2020-12-18 23:39:15 -08:00
ultima-soul
aefa35a04f
Merge pull request #1275 from ghoulslash/battle_anims
Fix Shadow Sneak Animation
2020-12-18 23:15:07 -08:00
Eduardo Quezada D'Ottone
8ffd9bfcca
Merge pull request #1271 from LOuroboros/drives_and_anims
Fixed softlock caused by the majority of Techno Blast's animations
2020-12-13 21:40:10 -03:00
LOuroboros
785e23222b Review correction 2020-12-13 21:20:27 -03:00
Evan
ead8637e4f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation 2020-12-13 17:09:04 -07:00
Evan
36b0e6dedc fix shake duration 2020-12-13 17:08:35 -07:00
Eduardo Quezada D'Ottone
47d96aed3c
Merge pull request #1285 from LOuroboros/spite
Updated Spite
2020-12-12 22:27:26 -03:00
Eduardo Quezada D'Ottone
ea1dca3024
Merge pull request #1270 from LOuroboros/drives_and_types
Made Techno Blast's animation change depending on the Drive held
2020-12-12 21:43:45 -03:00
Eduardo Quezada D'Ottone
db9933ce67
Merge pull request #1244 from ghoulslash/popup
toggleable manual ability popup destruction
2020-12-12 20:36:55 -03:00
LOuroboros
305bea32df Added missing check to Flower Gift (offensive) 2020-12-12 20:32:52 -03:00
Eduardo Quezada D'Ottone
2d742dc879
Merge pull request #1286 from LOuroboros/B_STANCE_CHANGE_FAIL
Improved the comment of B_STANCE_CHANGE_FAIL
2020-12-12 16:56:24 -03:00
LOuroboros
e9c6c96b9d Corrected Final Gambit's move data
It didn't have its own working effect assigned, and it wasn't being affected by King's Rock even though it should.
2020-12-12 11:57:49 -03:00
LOuroboros
31d483ef44 Some more battle_config.h tweaks 2020-12-12 11:35:05 -03:00
LOuroboros
c5e04cf243 Removed the unnecessary Dragon Energy effect
The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up.
I took the chance and fixed its target too.
2020-12-12 01:35:54 -03:00
LOuroboros
33d7f22494 Improved the comment of B_STANCE_CHANGE_FAIL 2020-12-11 21:54:17 -03:00
LOuroboros
17a9555715 Oopsie. 2020-12-11 21:43:18 -03:00
LOuroboros
9ec2e44f4c Updated Spite 2020-12-11 21:36:59 -03:00
LOuroboros
0ac026e6ca Added the data of SwSh's Crown Tundra's moves
And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.
2020-12-11 20:49:23 -03:00
NamNguyenUTSA
ee59fab143
Allow player partner NPC's to mega evolve
(i.e., Steven at Mossdeep)
2020-12-11 08:31:00 -06:00
Evan
964ec53a65 port cfru shadow sneak anim 2020-12-08 11:36:19 -07:00
ghoulslash
38b61ac5a0
Merge pull request #1273 from ghoulslash/battle_anims
Fix Terrain BG on new battles
2020-12-08 11:28:26 -07:00
BuffelSaft
a3b891bd65 Cap recoil for Gen 4 Jump Kick
Jump Kick's recoil in Gen 4 cannot exceed half of the target's maximum HP.
2020-12-07 19:41:49 +13:00
BuffelSaft
72b769ec75 Add config options for Jump Kick
Added options for:
- Gen 4 style recoil when target is immune (user takes 50% of target's max HP)
- Gen 3 style recoil when target is immune (i.e no recoil)
- Gen 5+ recoil was already implemented but was bugged
2020-12-07 19:30:31 +13:00
Evan
426ea191ad style fix 2020-12-05 21:04:12 -07:00
Evan
d5ad14c349 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup 2020-12-05 21:03:20 -07:00
Evan
37aeeae277 fix terrain bg on subsequent battle start 2020-12-05 20:25:03 -07:00
BuffelSaft
ef41a4c14d Fix Jump Kick
* Now inflicts recoil damage on the user if the target was immune to the attack
* Gen V+ recoil damage is now half of the user's HP instead of half of the target's HP.
2020-12-06 16:14:02 +13:00
LOuroboros
42a06c6003 Fixed softlock caused by the majority of Techno Blast's animations
And made the checks that sets its animation use the Type constants instead of their internal IDs.
2020-12-05 21:23:59 -03:00
LOuroboros
b6d0681779 Included hold_effects.h in battle_anim_new.c
Otherwise the file won't recognize HOLD_EFFECT_PLATE and will refuse to build a ROM.
2020-12-05 20:50:33 -03:00
LOuroboros
49ca76f880 Made Techno Blast's animation change depending on the Drive held 2020-12-05 20:39:05 -03:00
ultima-soul
e05b5fc8a3
Merge pull request #1260 from ghoulslash/BE_test
Fix Babydoll eyes animation
2020-12-04 15:46:17 -08:00
Eduardo Quezada D'Ottone
15a587f4e9
Merge pull request #1261 from ghoulslash/u16-abilities
Fix Buffering abilities > 255
2020-12-04 15:18:45 -03:00
ultima-soul
85d0693426
Merge pull request #1240 from ghoulslash/battle_anims
Terrain Moves Cause Permament BG Change
2020-12-03 20:04:21 -08:00
Evan
5c72a89105 fix B_BUFF_ABILITY 2020-12-02 15:03:49 -05:00
Evan
3102e499da fix babydoll eyes anim priority 2020-12-02 14:23:03 -05:00
Evan
58a79a4f37 shorten between-turn infestation anim length 2020-12-01 17:52:44 -05:00
Evan
1e68c46890 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into infestation 2020-12-01 17:51:38 -05:00
Evan
5478179464 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_anims 2020-12-01 17:46:26 -05:00