8444 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ghoulslash	f4537b1213	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into wandering_spirit	2021-10-30 09:14:32 -04:00
Eduardo Quezada D'Ottone	1811d75c23	Merge pull request #1829 from rh-hideout/revert-1760-ex_fix_move_bg_tilemaps ... Revert "Ex fix move bg tilemaps"	2021-10-30 09:08:25 -03:00
BuffelSaft	da30f023e8	Revert "Ex fix move bg tilemaps"	2021-10-30 19:32:37 +13:00
BuffelSaft	6b65ef5bcf	Merge pull request #1824 from ghoulslash/itemheal_fix ... Fix iteam healing after a failed move	2021-10-30 15:25:28 +13:00
BuffelSaft	f0e9b09258	Merge pull request #1822 from ghoulslash/harvest ... fix recycle and harvest	2021-10-30 15:00:56 +13:00
ghoulslash	cb9f4fbb42	Merge pull request #1760 from PikalaxALT/ex_fix_move_bg_tilemaps ... Ex fix move bg tilemaps	2021-10-29 09:12:15 -04:00
ghoulslash	2502820e83	document a couple hitmarkers. fix failing moves not updating hp from own healing effects	2021-10-29 09:03:14 -04:00
Eduardo Quezada D'Ottone	8b45320b9a	Merge pull request #1820 from ghoulslash/skill_swap ... Gen 4+ Skill Swap	2021-10-28 20:16:59 -03:00
ghoulslash	204748e01a	fix recycle and harvest	2021-10-28 17:52:52 -04:00
ghoulslash	f342e7c590	merge with be	2021-10-28 17:03:10 -04:00
ghoulslash	e2e31f0b74	skill swap config option for switchin abilities	2021-10-28 16:53:00 -04:00
ghoulslash	34e966fdee	Merge pull request #1815 from LOuroboros/hyperspaceFury ... Implemented Hyperspace Fury	2021-10-28 13:20:33 -04:00
ghoulslash	3a86881fb3	Merge pull request #1819 from LOuroboros/patch-2 ... Fixed Shadow Force	2021-10-28 13:19:24 -04:00
LOuroboros	82101d3581	Optimizations	2021-10-28 14:02:43 -03:00
LOuroboros	2803b840e5	Updated Shadow Force's move data	2021-10-28 13:52:35 -03:00
LOuroboros	28522f3ffb	Fixed Hyperspace Fury not breaking through protections ... Also repositioned VARIOUS_JUMP_IF_SPECIES.	2021-10-28 12:09:44 -03:00
ghoulslash	289ec6ad40	Merge pull request #1808 from AsparagusEduardo/BE_ghostEscape ... Completed Ghost type trapping inmunity	2021-10-26 22:22:13 -04:00
LOuroboros	1ab8c84f41	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into hyperspaceFury	2021-10-26 21:23:21 -03:00
Eduardo Quezada D'Ottone	d4eaa73292	Added check in IsRunningFromBattleImpossible.	2021-10-26 20:45:59 -03:00
Eduardo Quezada D'Ottone	773c773bac	Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape ... # Conflicts: # include/constants/battle_config.h	2021-10-26 20:35:01 -03:00
ghoulslash	83c1170698	Merge pull request #1802 from LOuroboros/rapidSpin ... Fixed Rapid Spin	2021-10-25 15:47:27 -04:00
LOuroboros	442376e75b	Replaced jumpifbyte with jumpifhalfword in a few BattleScripts	2021-10-25 16:36:17 -03:00
ghoulslash	bd268ba3d1	Merge pull request #1811 from AsparagusEduardo/BE_config ... battle_config.h reordering and new configs	2021-10-25 14:52:41 -04:00
Eduardo Quezada D'Ottone	44625561e5	Taunt turn config	2021-10-24 20:21:54 -03:00
Eduardo Quezada D'Ottone	70aeaf288f	Rough Skin damage config	2021-10-24 20:07:22 -03:00
Eduardo Quezada D'Ottone	8699db942b	More ordering	2021-10-24 20:03:21 -03:00
Eduardo Quezada D'Ottone	71ff664700	Ordered config into new categories	2021-10-23 20:11:02 -03:00
Eduardo Quezada D'Ottone	d95351dd97	Merge branch 'BattleEngine' into BE_config ... # Conflicts: # include/constants/battle_config.h	2021-10-23 19:46:33 -03:00
Eduardo Quezada D'Ottone	abb8a97d21	Merge pull request #1616 from LOuroboros/statCalcs ... Added configs for modern post-battle stat calcs	2021-10-23 13:35:21 -03:00
Eduardo Quezada D'Ottone	9a8b88bdb3	Updated config description	2021-10-23 11:59:57 -03:00
Eduardo Quezada D'Ottone	0f95adf77a	Fixed AI check for Mean Look in case it's set to be GEN_5 or lower.	2021-10-23 11:56:56 -03:00
Eduardo Quezada D'Ottone	f4ff76c8ae	MOVE_EFFECT_MEAN_LOOK now fails on ghost types.	2021-10-23 11:42:33 -03:00
Eduardo Quezada D'Ottone	8bdcbb856d	Ghosts can now escape any wild battle	2021-10-23 11:41:31 -03:00
Eduardo Quezada D'Ottone	3b746de1d4	Merge pull request #1789 from LOuroboros/plasmaFists ... Implemented Plasma Fists	2021-10-23 11:11:42 -03:00
Eduardo Quezada D'Ottone	76b6250104	Merge branch 'battle_engine' into plasmaFists	2021-10-23 11:06:34 -03:00
Eduardo Quezada D'Ottone	382ec13492	Merge pull request #1752 from ghoulslash/quick_draw ... Quick Draw	2021-10-22 22:39:03 -03:00
Eduardo Quezada D'Ottone	d0253640fb	Merge pull request #1739 from LOuroboros/primalReversionBE ... Implemented Primal Reversion	2021-10-22 22:27:45 -03:00
LOuroboros	4c90cbe625	Repositioned the gMoveResultFlags check	2021-10-22 19:58:27 -03:00
ghoulslash	09143c89e4	Merge pull request #1798 from LOuroboros/retaliateTimer ... Fixed Retaliate timer's value decrease	2021-10-22 10:51:37 -04:00
LOuroboros	cf027176a8	Made ENDTURN_RETALIATE use constants	2021-10-22 11:43:38 -03:00
LOuroboros	24876ac5e3	Small tweak for BattleScript_EffectRapidSpin	2021-10-22 07:21:31 -03:00
LOuroboros	dd82e051bd	Fixed Rapid Spin raising Speed even when the move fails	2021-10-22 07:21:10 -03:00
LOuroboros	34fe0c54be	Fixed Retaliate timer's value decrease ... I made an oopsie, basically. Thanks to Xavion#9504 for the fix.	2021-10-21 09:11:12 -03:00
Eduardo Quezada D'Ottone	2bd8ded9d2	Merge pull request #1791 from ghoulslash/baton_pass ... Update Baton Pass	2021-10-19 13:47:17 -03:00
ghoulslash	416c517e49	Merge pull request #1786 from Xavion3/damage_debug ... Adds simulated damage to the debug menu	2021-10-19 12:14:38 -04:00
ghoulslash	fa8fa32259	Update src/battle_main.c ... Co-authored-by: LOuroboros <lunosouroboros@gmail.com>	2021-10-19 11:52:50 -04:00
ghoulslash	ebc86bb247	update baton pass status3 bits	2021-10-19 09:38:27 -04:00
LOuroboros	a6315ffc75	Implemented Plasma Fists	2021-10-19 09:50:18 -03:00
ghoulslash	eda99fcf29	Merge pull request #1742 from AsparagusEduardo/be_gStatuses4 ... Add gStatutes4	2021-10-19 08:45:47 -04:00
ghoulslash	305a12161c	Merge pull request #1771 from BuffelSaft/mulit_target ... Fix multi target moves	2021-10-19 08:43:46 -04:00