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

4081 Commits

Author SHA1 Message Date
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
Eduardo Quezada D'Ottone
79edca1ae8 Fixed Pokédex showing by default Female version differences. 2020-11-07 21:24:20 -03:00
Eduardo Quezada D'Ottone
68627882a5 Merge remote-tracking branch 'pret/master' into PE-pretSync 2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone
209ff3aa5e Fixed spacing. 2020-11-06 18:11:05 -03:00
Eduardo Quezada D'Ottone
ed34e90848 Fixed new-line at EOF 2020-11-06 18:08:45 -03:00
Eduardo Quezada D'Ottone
5e33281350 Support for gender difference mon icons. 2020-11-06 17:48:03 -03:00
GriffinR
8b1c2c946b
Merge pull request #1247 from PidgeyALT/attemptcountfix 
use constants for ball throw count
 2020-11-06 15:41:25 -05:00
Eduardo Quezada D'Ottone
d7fbaa6cbf Support for gender palettes. 2020-11-06 17:12:57 -03:00
PikalaxALT
75b12b86dc
Merge pull request #1246 from PikalaxALT/simplify_ram_reset 
Simplify RAM reset adaptation for modern
 2020-11-06 15:00:40 -05:00
MCboy
e31158d017 add spaces around - and remove comment from include in battle.h 2020-11-06 23:29:52 +03:30
Eduardo Quezada D'Ottone
3849f7dd5d Female Eevee backsprite. 2020-11-06 16:45:25 -03:00
MCboy
3b91735e63 use constants for ball throw count 2020-11-06 22:59:46 +03:30
Eduardo Quezada D'Ottone
4d4b111327 Front pic gender differences for Eevee 2020-11-06 16:21:45 -03:00
PikalaxALT
3112cf5726 swi --> svc 2020-11-06 12:34:57 -05:00
PikalaxALT
c70c44fa48 Simplify RAM reset adaptation for modern 2020-11-06 12:29:40 -05:00
Eduardo Quezada D'Ottone
b494b6e987 Fixing Litleo's and Pyroar's gender ratio. 2020-11-06 14:28:10 -03:00
GriffinR
1220f0655c Revert to original battle factory gcc 10 fix 2020-11-04 17:46:07 -05:00
GriffinR
c3080a5a2a Fix typo 2020-11-04 16:46:26 -05:00
GriffinR
70ff0d1735 Condense fix for battle factory on gcc 10 2020-11-04 16:43:59 -05:00
Eduardo Quezada D'Ottone
6cb73c1e8a
Fixed Trapinch's evolutions abilities. (#555) from AsparagusEduardo 
Fixed Trapinch's evolutions abilities.
 2020-11-04 18:23:15 -03:00
GriffinR
c59a818462 Fix battle factory on gcc 10 2020-11-04 15:35:22 -05:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts 
Undo PokeCodec's PRs and port changes
 2020-11-03 09:28:45 -05:00
aaaaaa123456789
ca950a8daf Solve merge conflicts from previous commit 2020-11-02 22:18:26 -03:00
aaaaaa123456789
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
Kurausukun
6545745e59 Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts 2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227 address comments 2020-11-02 18:43:11 -05:00
Eduardo Quezada D'Ottone
c598daf228 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-FixTrapinchAbility 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2020-11-02 19:39:18 -03:00
ultima-soul
1e283e9dbf
Merge pull request #551 from LOuroboros/gen5_footprints 
Added footprints for the Gen. 5 species
 2020-11-02 10:28:06 -08:00
ExpoSeed
d6cbbc71a5
Merge pull request #29 from AsparagusEduardo/PR-CommentGen4Abilities 
Toggle options for abilities and Egg Groups.
 2020-11-01 21:07:24 -06:00
Eduardo Quezada D'Ottone
910d502df2 Review changes 2020-11-01 19:23:45 -03:00
Eduardo Quezada D'Ottone
014afea3df Fixed Trapinch's evolutions abilities. 2020-11-01 16:59:03 -03:00
Eduardo Quezada D'Ottone
44e066cdb4 Fixed missing abilities. 2020-11-01 15:37:01 -03:00
Eduardo Quezada D'Ottone
2c3d4ec7c7 Moved P_UPDATED_STATS ifs to above typing. 2020-11-01 15:32:50 -03:00
LOuroboros
bdcd910397 Swapped tabs to spaces in footprint_table.h 2020-11-01 15:18:41 -03:00
Eduardo Quezada D'Ottone
ad5b728967 Fixed Quick Feet BATTLE_ENGINE define. 2020-11-01 14:50:08 -03:00
Eduardo Quezada D'Ottone
56056c01f4 Fixed identation for real. 2020-11-01 14:45:41 -03:00
LOuroboros
7cf3c256cd Added footprints for the Gen. 5 species, thanks to Blackforest 2020-11-01 09:44:05 -03:00
GriffinR
9e55ae22b1
Merge pull request #1242 from GriffinRichards/constants-menuinfoicons 
Use constants for menu info icon table
 2020-10-29 23:50:43 -04:00
GriffinR
be1685c87f Use constants for menu info icon table 2020-10-29 16:34:33 -04:00
LOuroboros
6435158742 Added footprints for the Gen. 4 species 2020-10-27 09:38:04 -03:00
aaaaaa123456789
9794b077b5
Update src/digit_obj_util.c 
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
 2020-10-26 19:14:08 -03:00
aaaaaa123456789
bcbd05e151 Fix whitespace issues 2020-10-26 15:52:44 -03:00
aaaaaa123456789
4bbc14ecdd
Remove unused variable 
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
 2020-10-26 15:51:10 -03:00
aaaaaa123456789
00db69a302 Port back improvements from later commits 2020-10-26 12:31:07 -03:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466 re-match BattleIntroOpponent1SendsOutMonAnimation 
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
 2020-10-26 05:52:00 -04:00
Kurausukun
539fd463c8 port MovementAction_StoreAndLockAnim_Step0 fix 2020-10-26 03:46:08 -04:00
Kurausukun
43701c3860 port PrintMonWeight fakematch fix 2020-10-26 00:49:57 -04:00
Kurausukun
b2b363159f port sub_80C6104 fakematch fix 2020-10-26 00:46:01 -04:00