Commit Graph
7619 Commits
Author SHA1 Message Date
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
GriffinR bb91b1b0d1 Update generic macro argument names 2022-03-10 16:36:41 -05:00
GriffinR d664135572 Add usage of battle strings table offset constant 2022-03-10 10:44:04 -05:00
GriffinR b1d61b9227 Merge pull request #1641 from GriffinRichards/subsprite-arr-count
Use ARRAY_COUNT for obj event subsprite tables
2022-03-03 23:08:52 -05:00
GriffinR f78f46a1e2 Use ARRAY_COUNT for obj event subsprite tables 2022-03-03 14:54:05 -05:00
GriffinR 8bf7e7b6f5 Improve egg hatch documentation 2022-03-03 01:33:49 -05:00
ultima-soul 84a7f960c8 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2022-02-28 23:37:41 -08:00
GriffinR a2ee0c8393 Merge pull request #1639 from GriffinRichards/typo-hoppy
Fix bunny hoppy typo
2022-02-28 22:34:24 -05:00
GriffinR 5d58cdd297 Fix bunny hoppy typo 2022-02-28 13:34:39 -05:00
GriffinR 2142ad96d5 Merge pull request #1638 from GriffinRichards/menu-arr-count
Add missing menu array counts
2022-02-28 01:49:09 -05:00
GriffinR 3d0663fe81 Additional trader clean up 2022-02-27 13:58:48 -05:00
GriffinR 36e5d5e759 Add missing menu array counts 2022-02-27 13:47:50 -05:00
Eduardo Quezada D'Ottone 054f667446 Config for Kadabra ignoring Everstone upon evolving 2022-02-26 22:04:24 -03:00
Eduardo Quezada D'Ottone ed1ea69759 Fixed Shelmet and Karrablast being able to evolve if the partner is holding an Everstone 2022-02-26 21:40:20 -03:00
GriffinR 6262080e9c Merge pull request #1614 from laqieer/patch-1
Install libpng using pacman instead of manual build for msys2
2022-02-23 08:07:23 -05:00
GriffinR f7ba502c52 Merge pull request #1637 from cbt6/pc-location
Use constants for PC locations
2022-02-23 08:04:16 -05:00
cbt6 f826a5a82d Use constants for PC locations 2022-02-23 15:07:22 +08:00
GriffinR 3765c1e7f1 Merge pull request #1635 from sphericalice/battle-pyramind
Rename GetBattlePyramindTrainerEncounterMusicId to fix typo
2022-02-22 14:22:35 -05:00
sphericalice 40efac0ddf Rename GetBattlePyramindTrainerEncounterMusicId to fix typo 2022-02-22 19:13:17 +00:00