ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-17 00:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,586 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

3543 Commits

Author SHA1 Message Date
ghoulslash
ef19c8c415 fix gen define 2021-10-15 09:22:50 -04:00
ghoulslash
883a249836 config for catching semi-invulnerable mons 2021-10-15 09:20:32 -04:00
LOuroboros
3a25bce185 Turned Retaliate's effect into a side status 2021-10-15 06:03:48 -03:00
LOuroboros
1f97198267 Oops, I forgot to take the opponent's side into account 2021-10-15 05:02:14 -03:00
Eduardo Quezada D'Ottone
21837b659a
Merge branch 'battle_engine' into bug_bite 2021-10-14 19:46:50 -03:00
ghoulslash
85ce72a4d0 add shell smash anim 2021-10-14 10:47:39 -04: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
Eduardo Quezada D'Ottone
d689842689
Merge pull request #1657 from ghoulslash/rototiller 
Rototiller Fix + MOVE_TARGET_ALL_BATTLERS
 2021-10-13 22:45:50 -03:00
ghoulslash
a3d2bdc9cf merge with be 2021-10-13 18:30:53 -04:00
ghoulslash
3248bd796a add quick draw 2021-10-12 21:49:18 -04:00
ghoulslash
996301d5d3 add mirror armor 2021-10-12 18:04:34 -04:00
ghoulslash
bbd09fdcf7 add wandering spirit 2021-10-12 10:32:51 -04:00
LOuroboros
6c550cd749 Implemented Retaliate's effect 2021-10-11 03:19:21 -03:00
ghoulslash
06bcfea3b8 merge with be 2021-10-10 19:56:33 -04:00
ghoulslash
fcada4fcad handle rototiller + prankster 2021-10-10 19:54:17 -04:00
Eduardo Quezada D'Ottone
c3f8b77d82 Setting for pre-Gen6 Hidden Power Damage. 2021-10-10 20:26:38 -03:00
Eduardo Quezada D'Ottone
7798468ce9
Merge pull request #1738 from BuffelSaft/safety-googles 
Fix Safety Googles
 2021-10-10 18:34:20 -03:00
Eduardo Quezada D'Ottone
cf6e3873b4 Moved Electrified to Status4. 2021-10-10 01:13:23 -03:00
Eduardo Quezada D'Ottone
903c4cbf68 Config for Blizzard + Hail 2021-10-09 23:52:37 -03:00
Eduardo Quezada D'Ottone
004f705607
Merge pull request #1549 from ghoulslash/last_ball 
add last used ball
 2021-10-09 17:27:28 -03:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
BuffelSaft
274e964d91 Fix Safety Googles 
Fix typo and update gLastUsedItem before calling the safety goggles battle script.
 2021-10-09 15:05:01 +13:00
ghoulslash
ce455ac7e7 merge with be 2021-10-08 07:44:32 -04: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
9a4e0cf757 magician fixes, handle edge cases 2021-10-07 17:37:47 -04:00
ghoulslash
1031703309 magician base functionality 2021-10-06 16:00:02 -04: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
ee3a2c97ee Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-10-06 13:54:40 -04:00
ghoulslash
1ad8448532 remove saveblock field 2021-10-06 13:54:33 -04:00
ghoulslash
4382420dd2 merge with be 2021-10-06 13:32:59 -04: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
ghoulslash
761006a164 merge with be 2021-09-26 19:19:32 -04: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
Eduardo Quezada D'Ottone
e87c170db0 Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	src/battle_main.c
#	src/battle_script_commands.c
 2021-09-23 18:20:35 -03: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
768598b154 fix bad merge 2021-09-23 12:22:36 -04:00
ghoulslash
33972b5493 merge with be 2021-09-23 12:04:13 -04:00
ghoulslash
3f34fec42f change last ball graphic based on config. replace saveblock field with ewram field 2021-09-23 12:03:01 -04:00
Eduardo Quezada D'Ottone
d084d2a68d Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	include/battle.h
#	src/battle_main.c
#	src/battle_script_commands.c
 2021-09-22 23:42:00 -03:00