4117 commits

Author	SHA1	Message	Date
Eduardo Quezada	e883b7c251	Fixed Wish triggering Disguise (#5860)	2024-12-22 23:39:17 +01:00
Alex	f61a0f6a30	Sheer Force fix and move effect cleanup (#5812)	2024-12-21 19:45:50 +01:00
kittenchilly	c3133193e2	Fix Hit Escape moves giving Exp to the mon that switches in (#5844)	2024-12-21 10:30:25 +01:00
Alex	5b05e7913c	Pret merge (20th of December) (#5845)	2024-12-21 10:17:58 +01:00
PhallenTree	742f7a4875	Fixes Cotton Down and Gulp Missile not interacting correctly with stat reduction prevention effects (#5841)	2024-12-20 22:24:23 +01:00
Eduardo Quezada	82252251e7	Merge branch '_pret/master' into _RHH/pr/master/pretMerge20241220	2024-12-20 16:04:33 -03:00
Alex	b22a867e11	Fixes Room Service (#5827)	2024-12-19 14:12:01 +01:00
Alex	99ba36b446	Fixes Tidy Up (#5819)	2024-12-17 09:47:37 +01:00
kittenchilly	6e6352569f	Narrower font tweaks and font fitting fixes (#5782)	2024-12-07 18:12:09 -03:00
iriv24	cb12bdc220	Fix No Guard failing OHKO Moves into Semi-Invulnerable Pokemon (#5779) ... Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>	2024-12-07 18:11:45 -03:00
ghoulslash	6e24b6af3d	Gravity fix + Sky Drop Test (#5780) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-12-07 14:48:01 +01:00
ghoulslash	a775098e83	Fix octolock + defiant (#5781) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-12-07 13:38:34 +01:00
Eduardo Quezada	3f98c78297	Added POKEMART_LIST_END to avoid users accidentally removing it (#1947)	2024-12-04 17:38:23 -05:00
Eduardo Quezada	5c180a0b09	Added FONT_SHORT_NARROWER (#5101)	2024-12-04 06:30:19 -08:00
Alex	70224f0ea3	Fixes items preventing other switch in effects (#5732) ... Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-12-03 11:15:29 -05:00
Eduardo Quezada	1a581c407c	Merge branch '_RHH/master' into _RHH/upcoming	2024-12-01 08:11:32 -03:00
Alex	acdd447160	Changes Max Phantasm move anim script call (#5737)	2024-11-30 19:19:08 -05:00
Hedara	f6fdca615f	Merge branch 'master' into master-to-upcoming	2024-11-29 11:32:12 +01:00
Alex	c4fe97011e	Fix Floral Healing anim (#5733)	2024-11-28 22:51:34 +01:00
Sadfish the Sad	64887ee876	dark void, clangorous soulblaze, vortex animation fixes (#5650)	2024-11-25 19:57:22 +01:00
Alex	612c8d3ff6	Fixes heal blocked leeach seed in tests (#5700)	2024-11-21 17:18:44 +00:00
PhallenTree	596b8b20f4	Fixes Neutralizing Gas crashes + adds missing interaction, Regenerator small fix (#5694)	2024-11-21 17:35:05 +01:00
Alex	572ea141af	Fixes Absorb regression caused by #5670 (#5688)	2024-11-19 14:56:34 -05:00
Eduardo Quezada	b2ef363ac8	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-19 14:19:53 -03:00
Alex	67c7106fee	Refactors Absorb to use Moveend (#5670)	2024-11-17 09:59:04 +01:00
surtr-games	13692076f9	Fixed a bug with Counter and Mirror Coat where they would be scored up depending on the wrong target mon type category.	2024-11-14 00:30:25 -05:00
hedara90	a06dc03207	Fixed curse + Protean interaction (#5663) ... Co-authored-by: Hedara <hedara90@gmail.com>	2024-11-12 19:18:37 +01:00
hedara90	1d7e4cf8fc	Cleans up Primal Reversion code (#5659)	2024-11-12 13:48:06 +01:00
Alex	b55c87f73f	Fixes Take heart (#5658) ... Co-authored-by: KyleLaporte <moog272@gmail.com> Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-11-11 14:58:09 -05:00
Alex	a8351e305c	Fixes Red Card / Eject Pack interaction with Emergency Exit (#5657) ... Co-authored-by: Pawkkie <61265402+Pawkkie@users.noreply.github.com>	2024-11-11 14:56:51 -05:00
AlexOn1ine	a3fe53dd28	Cleans up Primal Reversion code	2024-11-11 20:31:21 +01:00
Eduardo Quezada	b48e5770be	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-11 15:58:42 -03:00
Eduardo Quezada	e005ffb576	Merge branch '_RHH/master' into _RHH/upcoming	2024-11-06 10:01:48 -03:00
Alex	8581646c22	Convert 3 variouses to callnatives (#5646)	2024-11-06 10:09:49 +01:00
Alex	dc740b4e9a	Fixes Magic Coat message (#5645)	2024-11-06 10:09:00 +01:00
Eduardo Quezada	afa7ab9b2e	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-24 07:47:52 -03:00
ghoulslash	6de4222c22	Fix AnimTask_HorizontalShake uses for shaking screen in battle anims (#5562) ... Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-10-22 16:24:48 +02:00
kittenchilly	db24128ee3	Update battle messages to Gen 5+ standards (#3240) ... Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-10-21 14:52:45 -03:00
Eduardo Quezada	3205f377d5	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-21 08:18:44 -03:00
Eduardo Quezada	495de8d182	Fix Follow Me failing in Single Battles for Gen 6/7 config (#5542)	2024-10-19 13:59:49 -03:00
ghoulslash	d487bd0548	Revival Blessing fixes + Using Lunar Blessing's animation (#5490) ... * revival blessing fixes, add anim * fix lunar blessing anim * Added support for Revival Blessing in tests * Added test to confirm absent flag fix --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com> Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>	2024-10-19 11:34:58 -03:00
Bassoonian	3077592e68	Pret merge 2024-10-15 (#5527)	2024-10-17 09:00:18 +02:00
Eduardo Quezada	ee9c6d4912	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-17 00:16:01 -03:00
AlexOn1ine	d044f53c72	Adds tests and Costar fix from PR #5526	2024-10-16 10:51:41 +02:00
ghoulslash	1cdc91ce53	Add Costar Tests, Download Test for Doubles (#5526) ... * add download double battle test * fix costar and add test --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2024-10-16 10:44:01 +02:00
Eduardo Quezada	9ed153ff93	Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015	2024-10-15 22:22:52 -03:00
Eduardo Quezada	80447bee8e	Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015	2024-10-15 20:56:56 -03:00
GriffinR	a0be2cbf7b	Fix Fallorbor typo	2024-10-12 23:50:12 -04:00
Eduardo Quezada	0a4b3a8dd7	Merge branch '_RHH/master' into _RHH/upcoming	2024-10-12 16:23:27 -03:00
Bassoonian	8dba27249c	Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210	2024-10-12 18:41:33 +02:00