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 |
|
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 |
|
ghoulslash
|
fccd4d14b1
|
Merge pull request #2085 from AsparagusEduardo/PE_PokemonJump
Added Pokémon Jump data.
|
2022-04-27 08:45:35 -04:00 |
|
ghoulslash
|
574be40f26
|
Merge pull request #2099 from Greenphx9/calyrex_rider_icons
Calyrex Rider Icons
|
2022-04-27 08:43:53 -04:00 |
|
Greenphx9
|
b3294c60a2
|
Calyrex Rider Icons
|
2022-04-22 16:31:17 +10:00 |
|
Eduardo Quezada D'Ottone
|
16283b47c7
|
Fixed compile. I had these changes in a testing branch but forgot to add them back here.
|
2022-04-16 15:57:38 -04:00 |
|
Eduardo Quezada D'Ottone
|
a6175d2622
|
Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs
|
2022-04-16 13:01:15 -04:00 |
|
Eduardo Quezada D'Ottone
|
84d713a50f
|
Legendary and Mythical flags
|
2022-04-14 18:44:20 -04:00 |
|
Eduardo Quezada D'Ottone
|
f8aa4d8e3a
|
Merge pull request #2089 from LOuroboros/pePret
Pret merge for the pokemon_expansion
|
2022-04-13 12:32:27 -04:00 |
|
LOuroboros
|
446bcd3181
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pePret
|
2022-04-11 01:23:18 -03:00 |
|
Eduardo Quezada D'Ottone
|
17f5f96f74
|
Added Pokémon Jump data.
|
2022-04-10 15:45:23 -04:00 |
|
Eduardo Quezada D'Ottone
|
5fc72c2bfe
|
Heights and weights in Pokédex Orders lists
|
2022-04-09 22:40:36 -04:00 |
|
GriffinR
|
8103caea15
|
Merge pull request #1650 from ISSOtm/patch-1
Add Arch Linux install instructions
|
2022-04-03 10:59:25 -04:00 |
|
Eldred Habert
|
e1f89c70d9
|
Add Arch Linux install instructions
I didn't test the devkitARM install instructions, but they are pretty much transcribed from the Ubuntu/Deb ones, so that should be fine.
|
2022-04-03 11:37:22 +02:00 |
|
GriffinR
|
44b44d3e77
|
Merge pull request #1648 from GriffinRichards/factory-bugfix
Add bugfix for Battle Factory trainer IVs
|
2022-03-31 22:26:03 -04:00 |
|
GriffinR
|
66cbe29c14
|
Add bugfix for Battle Factory trainer IVs
|
2022-03-30 09:37:03 -04:00 |
|
GriffinR
|
5160520639
|
Merge pull request #1642 from GriffinRichards/bstrings
Add usage of battle strings table offset constant
|
2022-03-14 16:40:54 -04:00 |
|
GriffinR
|
33c05cefe2
|
Merge pull request #1644 from GriffinRichards/name-jump-long-grass
Name unknown_16.png
|
2022-03-14 16:32:08 -04:00 |
|
GriffinR
|
058783c148
|
Fix comment mistake
|
2022-03-14 16:01:17 -04:00 |
|
GriffinR
|
0a0157b62c
|
Name unknown_16.png
|
2022-03-14 15:54:47 -04:00 |
|
Eduardo Quezada D'Ottone
|
ff4c391e47
|
Merge pull request #2074 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
|
2022-03-13 18:15:35 -03:00 |
|
Eduardo Quezada D'Ottone
|
ff9556cb44
|
Update include/constants/pokedex.h
|
2022-03-13 11:25:44 -03:00 |
|
Eduardo Quezada D'Ottone
|
8f34249ab2
|
Update include/constants/pokedex.h
|
2022-03-13 11:25:37 -03:00 |
|
GriffinR
|
ce227aa055
|
Merge pull request #1640 from GriffinRichards/doc-egg-hatch
Improve egg hatch documentation
|
2022-03-12 09:41:14 -05:00 |
|