482 Commits

Author	SHA1	Message	Date
ultima-soul	46e853c13b	Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-02-03 16:23:23 -08:00
ultima-soul	daf5e0167e	Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync	2021-02-03 16:06:48 -08:00
amiosi	f700004188	proper CamelCase	2021-02-02 14:21:00 -05:00
ultima-soul	5fdb578747	Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync	2021-02-01 15:58:18 -08:00
ultima-soul	2a20d50904	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-02-01 15:54:08 -08: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	2e0b02e491	Merge pull request #1322 from amiosi/pokemon_expansion ... Dex colors, mawile footprint, hoopa friendship, koffing abilities, config fix	2021-01-21 19:16:59 -06:00
ghoulslash	fcc6444c2e	Merge pull request #1329 from ultima-soul/add_fairy_frlg_icon_ie ... Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank	2021-01-21 12:20:15 -07:00
ghoulslash	fe7f2f18a4	Merge pull request #1328 from ultima-soul/add_fairy_frlg_icon_pe ... Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank	2021-01-21 12:19:41 -07:00
ghoulslash	c5491664bd	Merge pull request #1326 from ultima-soul/add_fairy_type_icon_ie ... Add Fairy-type Icon to Fix Contest Move Viewing Crash	2021-01-21 12:19:10 -07:00
ghoulslash	a3a2d881fa	Merge pull request #1327 from ultima-soul/add_fairy_frlg_icon_be ... Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank	2021-01-21 12:18:42 -07:00
Evan	4912bc1d25	Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion	2021-01-11 17:15:41 -07:00
GriffinR	e0c0143f41	Fix substitute back sprite	2021-01-04 10:14:01 -05:00
ExpoSeed	7dadcb94b8	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2021-01-03 17:14:43 -06:00
ultima-soul	3c8194c612	Add Fairy-type icon to fix Fairy TM info icon being blank.	2021-01-02 21:30:41 -08:00
ultima-soul	b58a8390f3	Add Fairy-type icon to fix Fairy TM info icon being blank.	2021-01-02 21:21:52 -08:00
ultima-soul	c2a3c5687b	Add Fairy-type icon to fix Fairy TM info icon being blank.	2021-01-02 21:11:47 -08:00
ultima-soul	9c34121a50	Fix crash when viewing Contest Moves in Summary Screen by adding Fairy type icon.	2021-01-02 14:03:46 -08:00
ExpoSeed	10f4b48215	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2021-01-01 14:14:51 -08:00
ExpoSeed	208e0abe04	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2020-12-31 18:44:43 -06:00
amiosi	6c5852c4e0	colors n stuff	2020-12-31 13:13:10 -05:00
GriffinR	ec85c01e7c	Merge branch 'master' into doc-factscreen	2020-12-31 00:40:45 -05:00
ghoulslash	a842f35428	Merge pull request #1301 from ultima-soul/gen_8_mon_data ... Add Gen 8 Pokémon Data	2020-12-17 20:52:15 -07:00
ultima-soul	c675c92a1d	Add Gen 8 Pokemon data.	2020-12-16 12:57:36 -08:00
LOuroboros	c8cf0a09a0	Corrected the icon sprite of Mandibuzz ... It was Mienfoo's, for some odd reason.	2020-12-14 16:19:38 -03:00
Evan	539a88207e	add z crystal and z ring	2020-11-29 10:00:03 -05:00
Ashley Coleman	0f04944b81	Rename graphics files for COOLTRAINER to match define	2020-11-26 11:05:02 -08:00
GriffinR	bf65c1fb25	Name object event pals/tags	2020-11-23 14:24:48 -05:00
LOuroboros	ab512b3d24	Fixed a few Pokémon icon sprites	2020-11-16 21:06:56 -03:00
Eduardo Quezada D'Ottone	d3a5921122	Review changes 3	2020-11-13 16:34:53 -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	3849f7dd5d	Female Eevee backsprite.	2020-11-06 16:45:25 -03:00
Eduardo Quezada D'Ottone	4d4b111327	Front pic gender differences for Eevee	2020-11-06 16:21:45 -03:00
Eduardo Quezada D'Ottone	0c6dc6abab	Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms ... # Conflicts: # graphics/pokemon/burmy/footprint.png # graphics/pokemon/gastrodon/footprint.png # graphics/pokemon/rotom/footprint.png # graphics/pokemon/shellos/footprint.png # graphics/pokemon/wormadam/footprint.png # include/constants/species.h # src/data/pokemon/base_stats.h	2020-11-03 00:13:51 -03:00
ultima-soul	1e283e9dbf	Merge pull request #551 from LOuroboros/gen5_footprints ... Added footprints for the Gen. 5 species	2020-11-02 10:28:06 -08:00
ExpoSeed	3573c467e7	Merge pull request #552 from LOuroboros/gen4_footprints_corrections ... Corrected a few Gen. 4 footprints after accidentally screwing them up	2020-11-01 20:59:24 -06:00
ultima-soul	1ec8282cd8	Merge pull request #545 from ExpoSeed/mega-pinsir-icon-fix ... Fix Mega Pinsir Icon	2020-11-01 10:15:08 -08:00
LOuroboros	e948ffc8b7	Corrected a few Gen. 4 footprints after accidentally screwing them up	2020-11-01 12:24:34 -03:00
LOuroboros	7fe0e779f4	Review corrections	2020-11-01 12:01:07 -03:00
LOuroboros	7cf3c256cd	Added footprints for the Gen. 5 species, thanks to Blackforest	2020-11-01 09:44:05 -03:00
ExpoSeed	c71f0ed1b7	Merge pull request #547 from LOuroboros/gen4_footprints ... Added footprints for the Gen. 4 species	2020-10-31 22:37:41 -05:00
LOuroboros	781b8f919e	Review changes	2020-10-30 17:41:50 -03:00
LOuroboros	79555e8a7e	Fixed Bouffalant's sprite	2020-10-27 15:31:59 -03:00
LOuroboros	480a8cc751	I missed Buneary's footprint	2020-10-27 15:16:20 -03:00
LOuroboros	3d117c9127	8bpp bad 1bpp good	2020-10-27 15:07:28 -03:00
LOuroboros	6435158742	Added footprints for the Gen. 4 species	2020-10-27 09:38:04 -03:00
ExpoSeed	2668f86256	Fixed Mega Pinsir icon. Thanks Blackforest!	2020-10-27 00:34:04 -05:00
Eduardo Quezada	2c098d8294	Merge branch 'pokemon_expansion' into PE-Ultima-Forms ... # Conflicts: # src/data/pokemon/base_stats.h	2020-10-26 20:06:37 -03:00
LOuroboros	15345fb401	Fixed the Honey's sprite and description	2020-10-24 06:26:30 -03:00
Eduardo Quezada	92728a1875	Added Ultimasoul's Forms from his FromID system.	2020-10-23 11:44:47 -03:00