ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-26 23:54:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,497 Commits 1 Branch 0 Tags
Commit Graph

2267 Commits

Author SHA1 Message Date
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
db9933ce67
Merge pull request #1244 from ghoulslash/popup 
toggleable manual ability popup destruction
 2020-12-12 20:36:55 -03:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -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
LOuroboros
c930a63c84 Implemented Punk Rock 2020-12-11 19:46:33 -03:00
LOuroboros
2b0702ec04 Implemented Perish Body 
Inspired by Raguzero's implementation.
 2020-12-11 19:44:32 -03:00
LOuroboros
7d8b8083e8 Implemented Sand Spit 2020-12-11 16:47:23 -03:00
LOuroboros
322918e280 Implemented Steam Engine 
And I also made the BattleScript created for Anger Point a bit more neutral friendly so it can be reused on situations like this.
 2020-12-10 18:27:35 -03:00
LOuroboros
8b5a5a1896 Reverted include/constants/abilities.h to vanilla 
With the new abilities introduced by the battle_engine in src/data/pokemon/base_stats.h behind locked behind that branch's defined label, we don't need to define them in this branch anymore.
 2020-12-10 16:38:29 -03:00
Evan
34dd11448b sticky barb transfer + pickpocket combo, fix CanBattlerGetOrLoseItem 2020-12-09 10:28:18 -07:00
Evan
a93a8b2194 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-12-08 20:50:43 -07:00
LOuroboros
791d561f14 Reworked the effects of the X Items 
Thanks to Karathan's indications.
 2020-12-08 18:24:42 -03:00
Evan
a0ae0ece53 add ultranecrozium-z and update z crystal data 2020-12-08 09:55:50 -07:00
GriffinR
f95192ed87 Define terminal species IDs relatively 2020-12-08 00:45:05 -05: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
d5ad14c349 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into popup 2020-12-05 21:03:20 -07:00
Evan
21cab1b7a7 better negative totem boost system, totems occur before switch in abilities 2020-12-05 21:00:51 -07:00
LOuroboros
ce8f794100
Updated abilities.h 
Straight up copied from the BE to avoid silly merge conflicts.
 2020-12-05 14:57:13 -03:00
LOuroboros
6a0fee9c56 Fixed Intrepid Sword and Dauntless Shield 
And also introduced a new BattleString for BattleScript_BattlerAbilityStatRaiseOnSwitchIn
 2020-12-05 14:03:13 -03:00
ghoulslash
66ed10a826
Merge pull request #1251 from ExpoSeed/PE-mon-flags 
Add mon flags
 2020-12-03 15:07:17 -05:00
Evan
39cbc21925 fix trainer theft, update config option 2020-12-03 08:42:12 -05:00
LOuroboros
9e1d7cc827 Implemented Ball Fetch 2020-12-02 23:09:35 -03:00
Evan
dcefaf2563 anim particle changes false by default 2020-12-01 18:01:02 -05:00
Evan
4ad5e368a9 fix merge conflicts 2020-12-01 17:57:57 -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
Evan
25abdeacc5 tidy up z move code 2020-12-01 16:36:44 -05:00
Evan
2bfc7ea9b1 merge upstream 2020-12-01 15:42:04 -05:00
Evan
ce19e33cc4 handle double and multi battles 2020-12-01 13:43:15 -05:00
Evan
fd8951d040 trainer z move ai 2020-12-01 08:24:33 -05:00
Evan
a0bde70493 z move effects 2020-11-30 10:55:46 -05:00
Evan
539a88207e add z crystal and z ring 2020-11-29 10:00:03 -05:00
Evan
752aca7698 finish z move anims 2020-11-29 09:22:31 -05:00
ExpoSeed
aa7facf57b
Merge pull request #1243 from ghoulslash/abilities 
Finish Switch In Ability Activation Messages
 2020-11-28 20:27:32 -06:00
Evan
f114534ae3 z move anim/effect, black hole eclipse anim 2020-11-28 13:09:43 -05:00
Evan
4060b09bd6 expand top left move window. add z move init anim 2020-11-27 17:06:36 -05:00
Evan
348d70b309 z move indicator and some data 2020-11-26 15:56:18 -05:00
ExpoSeed
f2259d7ce1 Remove IS_ULTRA_BEAST 2020-11-24 22:44:00 -06:00
ExpoSeed
3adf316574 Add mon flags 2020-11-24 22:42:42 -06:00
LOuroboros
c4c802162e A few more evo related changes. 
-EVO_MAP -> EVO_MAPSEC
-Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!)
-Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.
 2020-11-25 01:15:19 -03:00
LOuroboros
89f6036e77 Bumped EVOS_PER_MON from 8 to 10 2020-11-24 23:47:07 -03:00
Evan
7c6e74ab69 update terrain bg config option comment 2020-11-24 21:17:31 -05:00
Evan
6c0878b5fe infestation between turn anim 2020-11-24 17:21:59 -05:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
Evan
ef43596a79 toggleable manual ability popup destruction 2020-11-19 15:16:27 -07:00