ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,485 Commits 1 Branch 0 Tags 235 MiB
69b42de0d9
Commit Graph

2682 Commits

Author SHA1 Message Date
LOuroboros
69b42de0d9 Implemented Mimicry 
Thanks to AsparagusEduardo for helping me optimize RestoreBattlerOriginalTypes.
 2021-11-02 14:44:55 -03:00
BuffelSaft
1e3b3d482b
Merge pull request #1838 from Blackforest92/battle_engine 
Edit Spacial Rend and Hurricane background
 2021-11-02 17:11:47 +13:00
ghoulslash
b5d20da927 merge with be 2021-11-01 11:36:18 -04:00
BuffelSaft
fbce8b2ff0
Merge pull request #1749 from ghoulslash/wandering_spirit 
Wandering Spirit
 2021-11-01 11:26:53 +13:00
Blackforest92
9b6cd383a4 Optimized Rock Wrecker and Hurricane 2021-11-01 01:06:39 +07:00
ghoulslash
52d4d1cd34 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella 2021-10-31 11:40:00 -04:00
ghoulslash
bc170f3a43 merge with be 2021-10-31 11:04:39 -04:00
Blackforest92
c87e2433a7 Minor fix to Steel Beam 2021-10-31 21:41:39 +07:00
ghoulslash
e1f0e6285b
Merge pull request #1828 from BuffelSaft/gorilla-tactics 
Implement Gorilla Tactics
 2021-10-30 21:44:33 -04:00
LOuroboros
0ddcb69c65
Fixed Move_SPECIAL_REND typo 2021-10-30 12:14:28 -03:00
ghoulslash
468ee66cd8 fix synthesis and leaf guard w utility umbrella 2021-10-30 11:04:50 -04:00
ghoulslash
ee7b63e372 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into utility_umbrella 2021-10-30 09:26:33 -04:00
ghoulslash
3e364b4870 switchin abilities activate after wandering spirit 2021-10-30 09:16:33 -04:00
ghoulslash
f4537b1213 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit 2021-10-30 09:14:32 -04:00
Blackforest92
799852ea77 Introduce alternate Steel Beam 2021-10-30 17:00:55 +07:00
BuffelSaft
47bfeaeecd Implement Gorilla Tactics 
It's Choice Band but as an ability.
 2021-10-30 18:31:44 +13:00
ghoulslash
af914ee7ed merge w be 2021-10-29 22:33:50 -04:00
BuffelSaft
6b65ef5bcf
Merge pull request #1824 from ghoulslash/itemheal_fix 
Fix iteam healing after a failed move
 2021-10-30 15:25:28 +13:00
BuffelSaft
f0e9b09258
Merge pull request #1822 from ghoulslash/harvest 
fix recycle and harvest
 2021-10-30 15:00:56 +13:00
ghoulslash
2502820e83 document a couple hitmarkers. fix failing moves not updating hp from own healing effects 2021-10-29 09:03:14 -04:00
ghoulslash
204748e01a fix recycle and harvest 2021-10-28 17:52:52 -04:00
ghoulslash
f342e7c590 merge with be 2021-10-28 17:03:10 -04:00
ghoulslash
e2e31f0b74 skill swap config option for switchin abilities 2021-10-28 16:53:00 -04:00
ghoulslash
34e966fdee
Merge pull request #1815 from LOuroboros/hyperspaceFury 
Implemented Hyperspace Fury
 2021-10-28 13:20:33 -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
773c773bac Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape 
# Conflicts:
#	include/constants/battle_config.h
 2021-10-26 20:35:01 -03:00
ghoulslash
83c1170698
Merge pull request #1802 from LOuroboros/rapidSpin 
Fixed Rapid Spin
 2021-10-25 15:47:27 -04:00
LOuroboros
442376e75b Replaced jumpifbyte with jumpifhalfword in a few BattleScripts 2021-10-25 16:36:17 -03:00
Eduardo Quezada D'Ottone
f4ff76c8ae MOVE_EFFECT_MEAN_LOOK now fails on ghost types. 2021-10-23 11:42:33 -03:00
Eduardo Quezada D'Ottone
76b6250104
Merge branch 'battle_engine' into plasmaFists 2021-10-23 11:06:34 -03:00
Eduardo Quezada D'Ottone
382ec13492
Merge pull request #1752 from ghoulslash/quick_draw 
Quick Draw
 2021-10-22 22:39:03 -03:00
LOuroboros
4c90cbe625 Repositioned the gMoveResultFlags check 2021-10-22 19:58:27 -03:00
LOuroboros
24876ac5e3 Small tweak for BattleScript_EffectRapidSpin 2021-10-22 07:21:31 -03:00
LOuroboros
dd82e051bd Fixed Rapid Spin raising Speed even when the move fails 2021-10-22 07:21:10 -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
ghoulslash
8dc77e6fe3
Merge pull request #1782 from LOuroboros/glare 
Updated Glare
 2021-10-17 22:11:33 -04:00
Eduardo Quezada D'Ottone
ead5c92469
Merge branch 'battle_engine' into PLG 2021-10-17 17:38:54 -03:00
LOuroboros
e7ad7319e3 Updated Glare 2021-10-17 12:03:35 -03:00
LOuroboros
d6304099ac Review optimization 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-10-17 09:42:31 -03:00
LOuroboros
59cfbe55c1 Gave Grav Apple a move effect of its own 2021-10-17 09:27:35 -03:00
Eduardo Quezada D'Ottone
0a090616ef
Merge pull request #1765 from ghoulslash/shell_smash 
Shell Smash Animation
 2021-10-15 12:09:06 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite 2021-10-14 19:46:50 -03:00
Eduardo Quezada D'Ottone
8be9e4ae1d
Merge pull request #1763 from BuffelSaft/battle_bond 
Fix Battle Bond
 2021-10-14 18:23:13 -03:00
ghoulslash
85ce72a4d0 add shell smash anim 2021-10-14 10:47:39 -04:00
BuffelSaft
85dd7ff63c Fix Storm Drain/Dive bug 
If Storm Drain is triggered by dive it should clear the attacker's semi-invulnerable status.
 2021-10-14 16:40:18 +13:00
BuffelSaft
fc6e8f598c Merge branch 'battle_engine' into battle_bond 2021-10-14 16:24:59 +13:00