Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,156 Commits 1 Branch 0 Tags
Commit Graph

18156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LOuroboros
6f122ac8f8 Defined EVO_MOVE_MEGA_EVOLUTION for BE compatibility 2020-11-11 15:18:39 -03:00
ExpoSeed
0912577ea1
Merge pull request #575 from AsparagusEduardo/BE-WishMegaEvo 
Implemented Wish Mega Evolution
 2020-11-11 11:05:06 -06:00
Eduardo Quezada D'Ottone
dbd02d1857 Fixed defines. 2020-11-10 20:05:01 -03:00
Eduardo Quezada D'Ottone
caf6253ba3 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/pokemon_icon.c
 2020-11-10 19:37:02 -03:00
Eduardo Quezada D'Ottone
d97932c009 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/pokemon.c
 2020-11-10 19:29:50 -03:00
Eduardo Quezada D'Ottone
98d3427e62
Prevent Ability Popup overwrites #1218 from ghoulslash 2020-11-10 17:34:33 -03:00
Eduardo Quezada D'Ottone
e021a4aa87
Critical Capture Config Option And Catching Charm #556 from ghoulslash 
Critical Capture Config Option And Catching Charm
 2020-11-10 17:31:08 -03:00
Eduardo Quezada D'Ottone
e6f8d57f08 Merge remote-tracking branch 'RHH/battle_engine' into BE-WishMegaEvo 
# Conflicts:
#	include/constants/battle_string_ids.h
 2020-11-10 17:28:17 -03:00
ghoulslash
7a9476323c
Merge pull request #566 from AsparagusEduardo/PE-GenderDifferences 
Support for Gender Differences
 2020-11-10 12:31:03 -07:00
ExpoSeed
3e3c655f43
Merge pull request #563 from AsparagusEduardo/Fix-LitleoPyroarGender 
Fixing Litleo's and Pyroar's gender ratio.
 2020-11-10 11:42:25 -06:00
ExpoSeed
429df3c319
Merge pull request #571 from LOuroboros/new_surf_pal 
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
 2020-11-10 11:37:07 -06:00
ExpoSeed
17f7af747c
Merge pull request #569 from LOuroboros/anim_settings_label_fixes 
Fixed anim. settings labels in src/battle_anim.c
 2020-11-10 11:36:27 -06:00
ghoulslash
6b6750028a
Merge pull request #1216 from LOuroboros/intimidate 
Tweaked Intimidate a little
 2020-11-10 10:34:36 -07:00
LOuroboros
bb4f00737e B_EXPANDED_INTIMIDATE->B_UPDATED_INTIMIDATE 2020-11-10 14:26:47 -03:00
Evan
0683dc9c3f longer ability popup delay to prevent overwriting 2020-11-10 10:05:11 -07:00
Evan
de0518121e Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-11-10 09:00:30 -07:00
LOuroboros
a25190f357 A few things. 
-Introduced a Gen. 8 styled text string for Intimidate
-Added an ability popup to BattleScript_IntimidatePrevented
 2020-11-10 10:34:51 -03:00
LOuroboros
e179b9b5fe Updated Intimidate to Gen. 8 standard 2020-11-10 10:18:16 -03:00
Eduardo Quezada D'Ottone
6f29abbe0e
Plate type data and hold effect #1207 from ExpoSeed 2020-11-09 15:24:13 -03:00
ExpoSeed
ebaeeb7594
Merge pull request #1213 from AsparagusEduardo/BE-GlobalDefine 
Moved BATTLE_ENGINE define to global.h to fix reading from other bran…
 2020-11-09 12:01:44 -06:00
ExpoSeed
6829c5880d
Merge pull request #1214 from AsparagusEduardo/PE-GlobalDefine 
Moved POKEMON_EXPANSION define to global.h to fix reading from other branches
 2020-11-09 12:01:43 -06:00
ExpoSeed
79d9cb02ce
Merge pull request #1212 from AsparagusEduardo/IE-GlobalDefine 
Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine
 2020-11-09 12:01:41 -06:00
Eduardo Quezada D'Ottone
b19ee3c554 Capitalization. 2020-11-09 14:53:10 -03:00
Eduardo Quezada D'Ottone
03c7843e45 Capitalization 2020-11-09 14:52:58 -03:00
Eduardo Quezada D'Ottone
33ed87e2cb Capitalization 2020-11-09 14:52:18 -03:00
Eduardo Quezada D'Ottone
3a984136e7 Updated comment. 2020-11-09 14:50:18 -03:00
Eduardo Quezada D'Ottone
690307dbf9 Updated comment. 2020-11-09 14:49:23 -03:00
Eduardo Quezada D'Ottone
102e686a94 Updated comment. 2020-11-09 14:48:47 -03:00
GriffinR
7172ea35f9
Merge pull request #1248 from luckytyphlosion/master 
Bugfix for ChooseMoveOrAction_Doubles.
 2020-11-09 12:17:41 -05:00
GriffinR
19fa021c63
Merge pull request #1249 from luckytyphlosion/master 
Add missing files to .gitattributes.
 2020-11-09 12:13:45 -05:00
Eduardo Quezada D'Ottone
bacabf03a8 Review changes. 2020-11-09 13:45:08 -03:00
Eduardo Quezada D'Ottone
9eea1cc296 Updated to use internal Gen 8 move data. 2020-11-09 13:34:38 -03:00
Eduardo Quezada D'Ottone
df11b68acb Moved POKEMON_EXPANSION define to global.h to fix reading from other branches 2020-11-09 12:58:03 -03:00
Eduardo Quezada D'Ottone
df4d927e31 Moved BATTLE_ENGINE define to global.h to fix reading from other branches 2020-11-09 12:45:31 -03:00
Eduardo Quezada D'Ottone
b4cf674fa1 Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine 2020-11-09 12:38:53 -03:00
Eduardo Quezada D'Ottone
d00f485ebf
Fixed gen 3 fossil config #1209 
Fixed gen 3 fossil config
 2020-11-08 23:30:29 -03:00
luckytyphlosion
8a780977a8 Add missing files to .gitattributes. 
Only *.sed is required, all other files are listed to be explicit.
 2020-11-08 20:13:21 -05:00
Eduardo Quezada D'Ottone
ddb6142709 Review changes 3. 2020-11-08 21:08:58 -03:00
Eduardo Quezada D'Ottone
255a14affb Review changes 2. 2020-11-08 21:03:50 -03:00
Eduardo Quezada D'Ottone
35d5324324 Review changes. 2020-11-08 21:02:34 -03:00
Eduardo Quezada D'Ottone
4a17d62ecd Fixed gen 3 fossil config 2020-11-08 20:27:46 -03:00
Evan
03f480fa17 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-11-08 15:21:48 -07:00
ultima-soul
71e99e5918
Merge pull request #578 from AsparagusEduardo/IE-pretSync 
Sync with pret
 2020-11-08 14:18:39 -08:00
ultima-soul
8e30647ca1
Merge pull request #1205 from ultima-soul/battle_engine_sync 
Sync Battle Engine Upgrade to Upstream
 2020-11-08 14:18:16 -08:00
Evan
cdad1e7101 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2020-11-08 14:07:50 -07:00
Evan
980f208b78 use NATIONAL_DEX_COUNT for critical capture odds 2020-11-08 14:07:43 -07:00
TheXaman
86412bfe91 fixed tileset and stats screen bug 2020-11-08 16:22:03 +01:00
Eduardo Quezada D'Ottone
38f36955fd
Support for Battle Engine and Pokémon Expansion (#1) 
* Changed comment method to avoid conflict with Pokemon Expansion.

* Changes the way level up moves are read if it detects either Battle Engine or Pokémon Expansion.

* Support for Battle Engine's spit icon.
 2020-11-08 14:53:52 +01:00
ExpoSeed
7ea34968f9 Add damage calc for plates 2020-11-08 01:57:52 -06:00
Eduardo Quezada D'Ottone
2e01654eb9 Plate type data and hold effect. 2020-11-08 01:47:05 -06:00