11694 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ghoulslash	ac30ebd5a4	Merge pull request #2453 from AsparagusEduardo/RHH/pr/cleanup/configShiny ... Refactored Shiny configs + cleanup	2022-11-28 09:51:39 -05:00
ghoulslash	33873eff6f	Merge pull request #2460 from LOuroboros/rareCandiesLv100 ... Allow Lv100 'mons to access level based evos	2022-11-28 09:48:55 -05:00
BuffelSaft	70a10ebda0	Merge pull request #2462 from AsparagusEduardo/RHH/pr/fix/cries ... Fix cry table alignment due to missing placeholder Enamorus Therian cry	2022-11-27 02:12:38 +13:00
Eduardo Quezada	65a33ed442	Fix cry table alignment due to missing placeholder Enamorus Therian cry	2022-11-26 09:20:54 -03:00
LOuroboros	add75d84c0	Applied a couple of tweaks ... -Made it so only Rare Candies can evolve Lv100 'mons. Game Freak dumb. The Exp. Candies SHOULD work too. -Made sure to remove the candy that was used from the bag.	2022-11-25 18:12:51 -03:00
LOuroboros	53110a0ff6	Allow Lv100 'mons to access level based evos	2022-11-25 17:34:11 -03:00
Eduardo Quezada D'Ottone	b48f057fe7	Merge pull request #1589 from cynderquil/pokemon_expansion ... Fix Bastiodon's second icon frame	2022-11-20 20:47:07 -03:00
Eduardo Quezada	791c547b2c	Renamed missing overworld debug configs	2022-11-14 14:07:32 -03:00
Eduardo Quezada	540f4679bb	Implemented uses of Shiny config	2022-11-14 11:56:02 -03:00
Eduardo Quezada	011ec16f1e	Organized conffig files into their own folder and cleaned up	2022-11-14 11:03:49 -03:00
Eduardo Quezada D'Ottone	49b7328d32	Merge pull request #2451 from eatthepear/patch-1 ... Fix Berries that were broken after Bug Bite fix	2022-11-12 17:26:29 -03:00
eatthepear	bd4b660983	Fix Berries that were broken after Bug Bite fix ... Issue #2448 Haven't tested extensively, but regular Berries work and Bug Bite w/ Berries also works. I believe this line was missing by accident (you can look at the merged Bug Bite PR #2433 to see that this line was deleted and never replaced).	2022-11-11 21:28:44 -05:00
Eduardo Quezada D'Ottone	6197e76875	Merge pull request #2449 from LOuroboros/patch-1 ... Uncommented level up moves	2022-11-11 01:46:42 -03:00
LOuroboros	7260478c54	Uncommented level up moves	2022-11-11 01:31:22 -03:00
Eduardo Quezada D'Ottone	a2b355f2a4	Merge pull request #2422 from AsparagusEduardo/RHH/pr/sync/pretmerge_20221030 ... Support for Porymap 5.0.0 (pret merge 2022-10-30)	2022-11-09 20:15:15 -03:00
Eduardo Quezada	f2d0e547ac	Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/rom_header_gf.c	2022-11-09 19:54:44 -03:00
Eduardo Quezada	bd63ef18af	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030 ... # Conflicts: # src/pokemon_storage_system.c	2022-11-09 19:33:26 -03:00
GriffinR	9e24fe6ec8	Merge pull request #1816 from LOuroboros/patch-1 ... Fixed indentation in ScrCmd_faceplayer	2022-11-08 19:07:34 -05:00
LOuroboros	a35986fd9c	Fixed indentation in ScrCmd_faceplayer	2022-11-08 21:01:50 -03:00
Eduardo Quezada D'Ottone	e6ae0bd01e	Merge pull request #2434 from LOuroboros/badDreams ... Optimized Bad Dreams' code	2022-11-08 08:16:07 -03:00
GriffinR	0a6de12b5e	Merge pull request #1814 from AsparagusEduardo/pret/pr/storageDoc ... Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System	2022-11-06 23:35:53 -05:00
Eduardo Quezada	237877e21b	Doc missing uses of ST_OAM_OBJ_X in Pokémon Storage System	2022-11-07 00:00:23 -03:00
BuffelSaft	1da4eb3b14	Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid ... Config for Dark Void being only usable by Darkrai	2022-11-05 22:42:51 +13:00
BuffelSaft	bbd7b205fd	Merge pull request #2433 from ghoulslash/be/bug_bite ... Redo Bug Bite	2022-11-05 22:08:47 +13:00
LOuroboros	f56df74576	Optimized Bad Dreams' code ... Misc: -Made the ability pop up stick around until the ability's effect ends just like in ORAS. -Updated sText_BadDreamsDmg accordingly while I was at it.	2022-11-04 14:58:58 -03:00
Eduardo Quezada D'Ottone	fa8bf80905	Merge pull request #2420 from LOuroboros/teleport ... Updated CanTeleport	2022-11-04 12:40:25 -03:00
Eduardo Quezada D'Ottone	2b5aff2764	Merge pull request #2426 from tustin2121-2/patch-linker ... GF Header and Modern Builds	2022-11-04 12:27:13 -03:00
BuffelSaft	d05c74b9e9	Merge pull request #2430 from AsparagusEduardo/RHH/pr/fix/BadDreams ... Fixed Bad Dream's ability popup message	2022-11-05 03:42:44 +13:00
ghoulslash	7a0e541413	workaround for GetBattlerHoldEffectParam to handle bug bite different battler id	2022-11-04 10:29:05 -04:00
Eduardo Quezada	5b1552514e	Review changes	2022-11-04 11:10:06 -03:00
GriffinR	b1af66ebe5	Merge pull request #1812 from tustin2121/patch-linker ... GF Header and Modern Builds	2022-11-04 09:31:31 -04:00
ghoulslash	1e6903840a	Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into be/bugbite	2022-11-04 09:29:45 -04:00
ghoulslash	d13431b4ab	merge w rhh master	2022-11-04 09:29:39 -04:00
ghoulslash	f3d44f04f0	Merge pull request #1927 from AsparagusEduardo/PE_monAnimations ... Ported Gen 5 & 6 mon animations from Inclement Emerald + added most missing Gen 7 form animations	2022-11-04 09:17:31 -04:00
Eduardo Quezada	8c66b318eb	Fixed Bad Dream's ability popup message	2022-11-04 00:46:07 -03:00
Eduardo Quezada	d23b5c95c9	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations ... # Conflicts: # src/data/pokemon_graphics/front_pic_anims.h # src/pokemon.c	2022-11-03 23:31:20 -03:00
Eduardo Quezada	fbc71b3686	Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030	2022-11-03 21:46:37 -03:00
Eduardo Quezada	edf4e45c4d	Config for Dark Void being only usable by Darkrai	2022-11-03 21:36:12 -03:00
Eduardo Quezada D'Ottone	9ea3ad8938	Merge pull request #2427 from BuffelSaft/fix-stat-boost-on-hit ... Fix abilities that raise target's stat after hit	2022-11-03 08:50:18 -03:00
BuffelSaft	c169a9523e	Merge branch 'upcoming' into fix-stat-boost-on-hit	2022-11-03 22:01:30 +13:00
BuffelSaft	736ca893b6	Fix abilities that raise target's stat after hit ... Fix Justified, Berserk, Rattled, Stamina and Water Compaction printing the wrong message when they activate. Steam Engine was also updated to follow the gen 5+ ability activation method style.	2022-11-03 21:54:56 +13:00
tustin2121	116364334d	Fix build of jsonproc ... - Changing uint to unsigned int, as uint is not standard.	2022-11-02 19:51:43 -05:00
tustin2121	b32413d11e	Restoring the GFHeader ... - Also adding comment about what the header does and how to maintain it.	2022-11-02 12:45:36 -04:00
tustin2121	e698a6506f	Pinning GFHeader to front of modern ... - Pinning the GF Header, crt0, and main to the front of the ROM when building modern. - Moving the gflib before other source files, to make it closer to the non-modern linker script (and therefore smaller patches).	2022-11-02 12:44:32 -04:00
tustin2121	fd87c97ef8	Adding documentation about GFHeader	2022-11-02 12:42:58 -04:00
tustin2121	8ff5ae7eb4	Pinning the GF header to the front of modern ... - Pinning the GF Header, crt0, and main to the front of the ROM when building modern. - Moving the gflib before other source files, to make it closer to the non-modern linker script (and therefore smaller patches).	2022-11-02 12:42:26 -04:00
tustin2121	f4f9329653	Fix build of jsonproc ... - Changing uint to unsigned int, as uint is not standard.	2022-11-02 12:39:32 -04:00
Eduardo Quezada D'Ottone	b8371500d3	Merge pull request #1676 from BuffelSaft/multistrike ... Multi-hit refactor and Parental Bond	2022-11-01 21:16:04 -03:00
ghoulslash	53061c7d62	Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney ... Implemented Honey's Sweet Scent functionality	2022-11-01 20:09:30 -04:00
ghoulslash	c6cb54b54e	Merge pull request #2319 from AsparagusEduardo/RHH/pr/Lures ... Implemented Lures and Repel/Lure "use another" menu	2022-11-01 20:05:15 -04:00