Commit Graph

7673 Commits

Author SHA1 Message Date
Blackforest92
ff861ff963 Add some of Legends Arceus battle sprites 2022-07-04 12:28:40 +07:00
Blackforest92
8c88e8a9b7 Legends Arceus Pokemon 95% Finished 2022-07-03 17:15:37 +07:00
ghoulslash
ade935f6cf
Merge pull request #2167 from LOuroboros/ampedSyntax
Syntax fixes for Toxel's evo methods
2022-07-01 15:29:06 -04:00
LOuroboros
e2cc269b43 Updated syntax 2022-07-01 16:19:35 -03:00
ghoulslash
fc2cfd8c9d
Merge pull request #2136 from LOuroboros/pePretMerge
Pret merge for the pokemon_expansion
2022-07-01 09:22:55 -04:00
ghoulslash
6cb0434eff
Merge pull request #2152 from Sneed69/form_base_stats_macros
Condense base_stats.h and make mass editing Pokemon forms/variants easier
2022-07-01 09:10:49 -04:00
LOuroboros
5070d5b605 Syntax fixes for Toxel's evo methods 2022-06-10 08:00:45 -03:00
sneed
248863239b repair sawssuck abilities 2022-05-23 04:10:18 +03:00
sneed
b71fbec130 repair meteor minior stats 2022-05-23 03:29:01 +03:00
sneed
c8d78706ba add dex colors to castform forms 2022-05-23 02:53:01 +03:00
sneed
ce468a0903 add macros for handling form base stats 2022-05-23 01:04:21 +03:00
Eduardo Quezada D'Ottone
f2c509eab7
Merge pull request #2151 from Sneed69/dummy_abilities
Add dummy abilities to make base stats header smaller
2022-05-22 13:27:27 -04:00
sneed
587b056ccb add dummy abilities to PE 2022-05-22 19:55:09 +03:00
Eduardo Quezada D'Ottone
86cbc9a06c
Merge pull request #2145 from Sneed69/cherrim
Fix Cherrim/Flower Gift sprite swapping
2022-05-18 18:03:54 -04:00
sneed
ef496ddb9d Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into cherrim 2022-05-19 00:54:16 +03:00
Eduardo Quezada D'Ottone
ded8434635
Merge pull request #2144 from Sneed69/castform
Add missing castform sprite graphics rules
2022-05-18 17:52:36 -04:00
Eduardo Quezada D'Ottone
6ee5c203fc
Merge pull request #2143 from LOuroboros/patch-1
Added Castform's forms to HasTwoFramesAnimation
2022-05-18 17:52:09 -04:00
sneed
09bace2b26 fix cherrim sprite 2022-05-19 00:40:54 +03:00
sneed
5a4c165bea fix 4bpp instead of gbapal 2022-05-18 21:27:47 +03:00
sneed
49abca345d back_normal.4bpp to normal/back.4bpp 2022-05-18 21:11:39 +03:00
sneed
8c15c5b6d7 fix castform sprite 2022-05-18 20:47:14 +03:00
LOuroboros
059dc02aef
Update pokemon.c 2022-05-18 11:03:57 -03:00
LOuroboros
74265efe61 Corrected size value of trainerHillTimes 2022-05-13 10:55:53 -03:00
LOuroboros
5397d020d7 Moved order of defined header files in include/global.h 2022-05-13 10:51:13 -03:00
LOuroboros
08225bbba9 Post Pret merge fix
I made an oopsie.
2022-05-13 10:46:08 -03:00
LOuroboros
52d6c96e69 Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge 2022-05-13 03:20:42 -03:00
GriffinR
ed1cc203c6
Merge pull request #1654 from Kurausukun/better_dinfo
Don't Build Modern with -g by Default
2022-05-12 22:41:15 -04:00
Kurausukun
7d224197c0
Update INSTALL.md 2022-05-12 22:33:17 -04:00
Kurausukun
1c13335d16
Update INSTALL.md 2022-05-12 22:05:44 -04:00
GriffinR
1842af7570
Merge pull request #1655 from GriffinRichards/fix-berry-id
Fix math in CreateBerrySprite
2022-05-12 18:04:30 -04:00
ghoulslash
9c8191fb74
Merge pull request #2129 from LOuroboros/patch-1
Update tutor_learnsets.h
2022-05-11 15:19:23 -04:00
LOuroboros
5b1c31bbc9
Update tutor_learnsets.h 2022-05-10 12:39:36 -03:00
Eduardo Quezada D'Ottone
ab97405097
Merge pull request #2113 from AgustinGDLV/evo_overworld
Gen 8 Evolution Mechanics (Pokemon Expansion)
2022-05-09 17:40:30 -04:00
Eduardo Quezada D'Ottone
b43dfd5976
Quick formatting 2022-05-09 17:04:28 -04:00
Eduardo Quezada D'Ottone
b6922a1dab
Merge branch 'pokemon_expansion' into evo_overworld 2022-05-09 16:36:34 -04:00
AgustinGDLV
502ce4bb33 fixed graphics bug and reverted last commit 2022-05-08 21:16:16 -07:00
AgustinGDLV
e50d5661cd removed unneccesary preproc 2022-05-08 20:57:12 -07:00
AgustinGDLV
54163240d8 implemented toggelable cancellation / multi-evo 2022-05-08 20:55:29 -07:00
AgustinGDLV
8a0a2a5a39
Apply suggestions from code review
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-05-07 09:36:03 -07:00
ghoulslash
0172f84617
Merge pull request #2070 from AsparagusEduardo/PE_evoData
Updated missing evolution and form change data
2022-05-07 11:37:11 -04:00
AgustinGDLV
03c48b4f3f compatibility with evo_battle 2022-05-05 15:46:53 -07:00
AgustinGDLV
616e26121f added new line 2022-05-05 12:02:34 -07:00
AgustinGDLV
7d42f93861 added special overworld evo changes 2022-05-05 11:55:31 -07:00
Eduardo Quezada D'Ottone
a4118e891f
Merge pull request #2104 from Sneed69/dex_pic_fix
Fix potential dex pic bug
2022-05-01 21:37:20 -04:00
sneed
12082e033d Fix potential dex pic bug 2022-05-02 04:02:58 +03:00
ghoulslash
a60b814904
Merge pull request #2071 from AsparagusEduardo/PE_KadabraEverstone
Config for Kadabra ignoring Everstone upon evolving
2022-04-27 12:31:12 -04:00
Eduardo Quezada D'Ottone
cb9cace04f Merge remote-tracking branch 'RHH/pokemon_expansion' into PE_KadabraEverstone
# Conflicts:
#	include/constants/pokemon_config.h
2022-04-27 12:05:33 -04:00
ghoulslash
7bc50392d0
Merge pull request #2072 from AsparagusEduardo/PE_ShellBlastEverstone
Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone
2022-04-27 08:51:37 -04:00
ghoulslash
909602ae58
Merge pull request #2064 from AsparagusEduardo/PE_dexShinyGenderFix
Addressed inconsistency in behavior with Shiny mon with gender differences upon catch
2022-04-27 08:49:49 -04:00
ghoulslash
166b16d22c
Merge pull request #2091 from AsparagusEduardo/PE_LegendaryIV
Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs
2022-04-27 08:48:22 -04:00