3034 Commits

Author	SHA1	Message	Date
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
Eduardo Quezada D'Ottone	b6922a1dab	Merge branch 'pokemon_expansion' into evo_overworld	2022-05-09 16:36:34 -04: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	7d42f93861	added special overworld evo changes	2022-05-05 11:55:31 -07: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	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	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
GriffinR	fc5747f0f7	Merge pull request #1649 from GriffinRichards/clean-trainer ... Trainer hill clean up	2022-04-20 00:20:44 -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
LOuroboros	446bcd3181	Merge branch 'master' of https://github.com/pret/pokeemerald into pePret	2022-04-11 01:23:18 -03:00
GriffinR	328b925a08	Move trainer hill map data to bin files	2022-03-31 14:08:31 -04:00
GriffinR	62f3f144ab	Clean up some trainer hill	2022-03-31 12:54:07 -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
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	d664135572	Add usage of battle strings table offset constant	2022-03-10 10:44:04 -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
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
Eduardo Quezada D'Ottone	755b31bee0	Enable form change for the Forces of Nature	2022-02-26 12:19:38 -03:00
sphericalice	40efac0ddf	Rename GetBattlePyramindTrainerEncounterMusicId to fix typo	2022-02-22 19:13:17 +00:00
GriffinR	7d2344c07b	Merge pull request #1616 from GriffinRichards/missing-req ... Add missing :req, remove old macros	2022-02-02 22:09:36 -05:00
GriffinR	2efbd5f549	Merge pull request #1608 from GriffinRichards/fix-fieldmap ... Fix some incorrect fieldmap names	2022-01-26 17:51:56 -05:00
GriffinR	2495d18132	Add missing :req, remove old macros	2022-01-23 18:52:04 -05:00
GriffinR	3d0326106e	Z coord / height -> elevation	2022-01-21 12:48:19 -05:00
GriffinR	79dfac92c9	Merge pull request #1604 from GriffinRichards/clean-spinda ... Document Spinda spot algorithm	2022-01-21 09:55:43 -05:00
GriffinR	fb81d9ad4a	Correct map data comment	2022-01-20 23:26:39 -05:00
Eduardo Quezada D'Ottone	7d75e16312	Small documentation and cleanup	2022-01-20 12:25:48 -03:00
GriffinR	062cdbe01c	Merge pull request #1599 from GriffinRichards/fix-tilemaps ... Break up graphics/interface and graphics/misc	2022-01-20 08:53:44 -05:00
GriffinR	a7e6045d71	Merge pull request #1597 from GriffinRichards/misc-cleanup ... Miscellaneous fixes	2022-01-19 22:17:37 -05:00
GriffinR	c4f33f2b2b	TRAVERSABLE->UNUSED, rename MB_SECRET_BASE_OBSTACLE	2022-01-19 12:54:55 -05:00
GriffinR	e682c12519	sTileBitAttributes to sparse array, rename MB_UNNUSED_CAVE	2022-01-19 12:39:11 -05:00
GriffinR	8200fda14e	Fix decorations metatile attribute names	2022-01-19 10:56:54 -05:00
GriffinR	a8b466dc80	Disambiguate fieldmap names	2022-01-19 10:15:32 -05:00
GriffinR	f127e64a3c	Name overworld tilemaps for their bg, add layer type constants	2022-01-19 09:37:12 -05:00
GriffinR	225147a94f	Document Spinda spot algorithm	2022-01-17 15:34:18 -05:00
GriffinR	69759b2d12	Merge pull request #1601 from GriffinRichards/fix-decor-flag ... Fix FLAG_DECORATION_0 name	2022-01-16 17:44:58 -05:00
LOuroboros	a4d31da923	Updated the value of MAX_MAP_DATA_SIZE	2022-01-16 19:22:28 -03:00
Eduardo Quezada D'Ottone	b86694876c	Merge pull request #1508 from Scott-Bonner/get_ability ... Handle GetAbilityBySpecies edge cases	2022-01-15 12:56:50 -03:00
ghoulslash	a0aaad2856	Merge pull request #2016 from AsparagusEduardo/PE_genderDiff ... Optimized SpeciesHasGenderDifference into Base Stat flag	2022-01-13 11:55:29 -05:00
GriffinR	694aa3c65d	Move balls, shop, link, map popups, and bag out of interface	2022-01-11 13:53:23 -05:00