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

242 Commits

Author SHA1 Message Date
ExpoSeed
7802264732 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-03-01 19:38:13 -06:00
amiosi
a021204389 oricorio pau constants 2021-02-02 14:49:01 -05:00
amiosi
2d6b80455d Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 13:25:53 -05:00
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
ultima-soul
96232ea166 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-01-28 23:59:08 -08:00
ExpoSeed
34c6771e94 Create form change table 2021-01-27 16:30:43 -06:00
ghoulslash
32cc04c91c
Merge pull request #1311 from ultima-soul/deoxys_handling_removal 
Remove Special Handling for Deoxys
 2021-01-21 12:22:03 -07:00
ghoulslash
b4b1d2b9e2
Merge pull request #1315 from ultima-soul/form_species_tables_pe 
Add Form Species ID Tables
 2021-01-20 13:54:20 -07:00
ultima-soul
9663ed0d3c Merge branch 'form_species_tables' into form_species_tables_pe 2021-01-20 12:06:59 -08:00
ultima-soul
267900bdcb Add Form Species ID tables and functions to access them. 2021-01-20 11:31:20 -08:00
GriffinR
18b8e0ee8e
Merge pull request #1311 from GriffinRichards/clean-unused 
Remove unused local variables and functions
 2021-01-19 23:22:44 -05:00
GriffinR
b65980cd4e Remove unused local variables and functions 2021-01-19 18:19:33 -05:00
GriffinR
bc20fda604 Use GET_UNOWN_LETTER macro 2021-01-19 04:03:16 -05:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
ultima-soul
3cb09b6507 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal 2021-01-11 15:19:11 -08:00
GriffinR
e6aebc16da
Merge pull request #1296 from GriffinRichards/bugfix-typo 
Add missing braces to bugfix in CalculateMonStats
 2021-01-10 12:34:39 -05:00
GriffinR
8afc28c98f Add missing braces to bugfix in CalculateMonStats 2021-01-10 12:24:59 -05:00
SphericalIce
f02afc134b Use the correct constant for max-IV masks 2021-01-07 22:34:57 +00:00
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
ultima-soul
6a0939cd4e Remove special handling for Deoxys. 2020-12-21 22:39:19 -08:00
ultima-soul
ad67068f7e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data 2020-12-16 13:28:42 -08:00
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush 
fakematch fixes, begin documenting Berry Crush (based on #1187)
 2020-12-14 23:22:41 -05:00
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
Kurausukun
58976ebaa8 Merge remote-tracking branch 'upstream/master' into berry_crush 2020-12-10 23:30:52 -05:00
Jaizu
8b46a3b305
Change Pidgey front animation 2020-12-07 12:07:50 +01: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
Eduardo Quezada D'Ottone
b2f078410f Review changes 2 2020-11-13 16:13:13 -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
ghoulslash
7a9476323c
Merge pull request #566 from AsparagusEduardo/PE-GenderDifferences 
Support for Gender Differences
 2020-11-10 12:31:03 -07: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
cb6802f01e Standarized naming schemes. 2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
d7fbaa6cbf Support for gender palettes. 2020-11-06 17:12:57 -03:00
Eduardo Quezada
ed6fd6c964 Fixed compile 2020-10-26 22:37:01 -03:00
Eduardo Quezada
dbd382e61b Added missing National Dex association. 2020-10-26 22:20:30 -03:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun
83846b913a port sub_806F160 fakematch fix 2020-10-26 00:01:53 -04:00
Kurausukun
b2100cb480 port ModifyStatByNature fakematch fix (from #1179) 2020-10-25 23:23:40 -04:00
Eduardo Quezada
92728a1875 Added Ultimasoul's Forms from his FromID system. 2020-10-23 11:44:47 -03:00
Eduardo Quezada
86334ca011 0 for SPECIES_NONE 2020-10-14 20:50:33 -03:00
Eduardo Quezada
34ce08db0b Added Karrablast/Shelmet evolution method. 2020-10-14 20:16:18 -03:00
ExpoSeed
bc4e992be2 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-11 00:10:12 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
ExpoSeed
5794fc69e8 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion 2020-10-04 02:35:23 -05:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
Kaz
847878eae9 battle_gfx_sfx_util.c: Very annoying fakematch fix. 
daycare.c: -g eliminates the need for the brace hack.
battle_transition.c: Fix Phase2_Ripple_Func2...?
 2020-09-19 17:12:25 -04:00
kiliwily
f1366dfc69 Fix typos 2020-09-19 20:46:26 +02:00