6733 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
MandL27	2d92f23240	Merge pull request #1514 from pineapplemachine/pokemon_expansion_evo_fix ... Fixes to pokemon_expansion species evolution data: Galarian Ponyta, Tranquill, and Kubfu	2021-05-28 11:31:25 -04:00
Sophie Kirschner	1a4c6d3490	Fixes to species evolution data	2021-05-28 18:16:52 +03:00
ultima-soul	eedd374a5f	Merge pull request #1420 from Blackforest92/pokemon_expansion ... Added missing gen8 battle sprites and available icons and various fixes	2021-05-24 21:13:12 -07:00
Blackforest92	d74492b591	Returning Alcremie back to monkey	2021-05-25 10:57:06 +07:00
Blackforest92	2dccce7675	Erased Eternamax comment in src/data/pokemon_graphics/enemy_mon_elevation.h ... Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>	2021-05-25 09:17:50 +07:00
ExpoSeed	2ad251cec3	Merge pull request #1491 from surskitty/mega_evolution_hidden_abilities ... Pokemon with no ability recheck first ability slot.	2021-05-22 14:59:06 -05:00
Eduardo Quezada D'Ottone	5fd4c35483	Merge pull request #1412 from amiosi/noFlip ... restore and add noFlip values	2021-05-21 11:44:11 -04:00
Eduardo Quezada D'Ottone	dff6a574f2	Merge pull request #1489 from LOuroboros/panchams_evo_method ... Fixed Pancham's evo method	2021-05-21 11:38:22 -04:00
surskitty	ba42b4daf4	If a Pokemon's ability is set to ABILITY_NONE, try to set it to the first ability slot. #1490	2021-05-17 17:08:01 -04:00
ultima-soul	50c2514267	Merge pull request #1469 from ultima-soul/pokemon_expansion_sync ... Pokemon Expansion Upstream Sync	2021-05-13 20:56:29 -07:00
LOuroboros	c94703e0bc	Fixed Pancham's evo method	2021-05-10 20:54:42 -03:00
ghoulslash	9e1b885ec1	Merge pull request #1464 from ExpoSeed/PE/hidden_ability_refactor ... Hidden ability refactor	2021-05-04 09:49:15 -06:00
ultima-soul	cf0fd961b9	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-28 23:56:58 -07:00
GriffinR	f7a699c686	Merge pull request #1421 from GriffinRichards/doc-tvrecordmix ... Document TV	2021-04-29 00:25:01 -04:00
ultima-soul	0da3f74a7e	Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync	2021-04-28 18:58:38 -07:00
GriffinR	6c38837b26	Merge pull request #1420 from GriffinRichards/doc-dataanims ... Document battler affine anims, default pokeball throw	2021-04-28 13:56:42 -04:00
GriffinR	58cef0ae52	Merge pull request #1418 from GriffinRichards/sync-ereaderhelp ... Sync e-reader helpers, document trainer hill e-reader	2021-04-28 06:08:57 -04:00
GriffinR	c6300b5325	Merge pull request #1417 from GriffinRichards/doc-pyramidbag ... Document Battle Pyramid Bag	2021-04-27 14:48:09 -04:00
GriffinR	18f85b5cf0	Merge pull request #1415 from GriffinRichards/doc-contestutil ... Some Contest clean up	2021-04-27 02:29:41 -04:00
GriffinR	d74017d256	Merge pull request #1419 from GriffinRichards/doc-animstatus ... Label more unused battle anims	2021-04-26 13:32:15 -04:00
GriffinR	c0aedf8df4	Merge pull request #1410 from GriffinRichards/doc-tradedata ... Document trade sequence animation, some trade cleanup	2021-04-26 13:26:12 -04:00
GriffinR	aad090e154	Document TV	2021-04-26 12:35:35 -04:00
GriffinR	e40f89b175	Move unknown data table, reference with species	2021-04-25 02:19:01 -04:00
GriffinR	bee60f4c64	Document battler sprite affine anims, default pokeball throw	2021-04-25 02:18:34 -04:00
GriffinR	e065c0c285	Label more unused battle anims	2021-04-24 18:26:25 -04:00
GriffinR	86475c5ded	Document trainer hill ereader	2021-04-24 18:04:27 -04:00
GriffinR	004c37bf02	Sync ereader_helpers with pokefirered	2021-04-24 18:03:06 -04:00
GriffinR	8c820878bf	Document Battle Pyramid Bag	2021-04-23 15:07:36 -04:00
GriffinR	f823cd224f	Merge pull request #1416 from ProjectRevoTPP/apprentice_fix ... [LEAK INFORMED] Fix apprentice.c do{}while(0)	2021-04-22 17:25:52 -04:00
ProjectRevoTPP	6ebd0ccb57	add NO_COND macro	2021-04-22 17:20:28 -04:00
ProjectRevoTPP	5c51a3ecc6	get rid of apprentice fakematching(s)	2021-04-22 16:40:46 -04:00
GriffinR	bc9fc38254	Misc contest cleanup	2021-04-22 15:51:04 -04:00
GriffinR	e874dfcbc8	Merge pull request #1408 from GriffinRichards/doc-pokemonstorage ... Document Pokémon Storage System	2021-04-22 01:32:16 -04:00
GriffinR	8dd6af1db1	Merge pull request #1414 from ProjectRevoTPP/rfu_NI_stopReceivingData ... fix rfu_NI_stopReceivingData fakematching; i guess it aint over yet cowboy	2021-04-22 01:26:45 -04:00
ProjectRevoTPP	ddc1534098	idiot, get rid of code in block	2021-04-21 21:38:42 -04:00
ProjectRevoTPP	00eeb727db	fix rfu_NI_stopReceivingData fakematching; i guess it aint over yet cowboy	2021-04-21 21:37:12 -04:00
GriffinR	dbe24f0baa	Clean up contest_painting	2021-04-21 20:04:12 -04:00
GriffinR	e96e7ba2e8	Merge pull request #1412 from ProjectRevoTPP/Sio32IDIntr ... Eliminate the last fakematching (Sio32IDIntr). We are free of nonmatchings/fakematchings!	2021-04-21 08:49:22 -04:00
ProjectRevoTPP	57948b86a8	Eliminate the last fakematching. We are free of nonmatchings/fakematchings!	2021-04-20 21:31:39 -04:00
GriffinR	a2a9f22612	Clean up contest_util	2021-04-20 21:16:47 -04:00
GriffinR	f8e5bac883	Merge pull request #1411 from ProjectRevoTPP/sio32intr ... Resolve sio32intr_clock_slave fakematching. One left!	2021-04-20 14:50:51 -04:00
ProjectRevoTPP	21f05a3c01	Resolve sio32intr_clock_slave fakematching. One left!	2021-04-20 12:58:50 -04:00
GriffinR	04af378904	Document trade sequence animation, some trade cleanup	2021-04-20 05:50:39 -04:00
GriffinR	b65d4eb910	Merge pull request #1409 from Kurausukun/M4A_IS_DEAD ... FIX CGBMODVOL FAKEMATCHING (WE DID IT REDDIT)	2021-04-20 00:14:02 -04:00
Kurausukun	d542baf14b	THE BEAST IS SLAIN	2021-04-19 23:44:24 -04:00
GriffinR	342ebbf406	Merge branch 'master' into doc-pokemonstorage	2021-04-18 01:49:09 -04:00
GriffinR	52495e889f	Doc storage - cleanup	2021-04-18 01:44:25 -04:00
GriffinR	6f967ff6ad	Doc storage - standardize names, drop PSS	2021-04-17 23:40:27 -04:00
GriffinR	33c68255de	Doc storage - unk utility	2021-04-17 23:31:29 -04:00
GriffinR	7bf89d6446	Doc storage - icon scroll	2021-04-17 23:00:08 -04:00