9037 Commits

Author	SHA1	Message	Date
ghoulslash	05bef50a1f	Merge pull request #2658 from DizzyEggg/one_vs_two_egg ... Fix 1 vs 2 battles with eggs	2023-02-16 09:20:18 -05:00
ghoulslash	60a3da5811	Merge pull request #2691 from DizzyEggg/clang_scales ... Fix Clanging Scales target and effect	2023-02-16 09:13:33 -05:00
ghoulslash	8c81cf1e66	Merge pull request #2692 from DizzyEggg/shields_down ... Fix Shield Down Ability pop-up	2023-02-16 09:11:24 -05:00
sbird	fea54c9277	[intro] add fading, refactor abort, align intro gfx	2023-02-16 10:43:50 +01:00
DizzyEggg	97f9c0a4d9	oof	2023-02-15 23:45:53 +01:00
DizzyEggg	f6a0c882d1	Fix Shield Down Ability pop-up	2023-02-15 23:44:00 +01:00
DizzyEggg	94651e77a5	Fix Clang Scales target and effect	2023-02-15 22:18:18 +01:00
Eduardo Quezada	7ddebb6671	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 ... # Conflicts: # data/battle_ai_scripts.s # src/menu_specialized.c # src/mystery_gift_menu.c	2023-02-15 14:18:00 -03:00
Eduardo Quezada	b62e5aa72e	Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230214 ... # Conflicts: # src/battle_main.c # src/field_specials.c # src/trade.c	2023-02-15 14:11:03 -03:00
Eduardo Quezada	bd54990333	Review changes	2023-02-15 13:56:11 -03:00
GriffinR	69fdf0faa4	Merge pull request #1853 from GriffinRichards/doc-contest-bar ... Clarify AI_CV_AttackDown_UnknownTypeList	2023-02-15 11:29:57 -05:00
GriffinR	671c9c5353	Merge branch 'master' into doc-chat	2023-02-15 10:57:05 -05:00
Alex	e4045a7a5f	z move pp color (#2690)	2023-02-15 16:19:09 +01:00
GriffinR	a322379feb	Merge branch 'master' into doc-windows	2023-02-15 10:04:48 -05:00
GriffinR	9c1c598160	GROUPTYPE_NONE to unsigned	2023-02-15 09:49:33 -05:00
DizzyEggg	3f0f7c6b7f	Fix Battle Bond activating multiple times in battle	2023-02-15 15:30:29 +01:00
LOuroboros	7885941d3c	Tweaked Task_HandleExpansionIntro to fix the water drops glitch ... Thanks to Tustin2121.	2023-02-14 14:03:18 -03:00
ghoulslash	908b509401	Fix Round's Base Power calc, Add Turn order effects (#2602) ... * fix round base power calc, add turn order change * remove unused callnative cmd * fix round turn order update * fix moveTarget getting set incorrectly in HandleAction_UseMove. also redirection doesn't affect MOVE_TARGET_ALL_BATTLERS --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-02-14 16:49:50 +01:00
ghoulslash	094554b3a3	Merge pull request #2681 from DizzyEggg/jaw_lock ... Fix Jaw Lock locking player pokemon	2023-02-13 10:40:47 -05:00
DizzyEggg	2b4d2a7695	Fix Jaw Lock locking player pokemon	2023-02-13 16:27:21 +01:00
ghoulslash	d1ef53f93a	Merge pull request #2678 from AlexOn1ine/z_indicator_in_doubles ... Z-Move Indicator was wrongly displayed in double battles	2023-02-13 08:52:06 -05:00
DizzyEggg	0577d8d04d	Fix Mirror Armor against Clear Body	2023-02-13 14:44:34 +01:00
ghoulslash	c399391891	Merge pull request #2677 from AlexOn1ine/z_moves_switch_order ... Fix switching Z-Moves when pressing SELECT in battle	2023-02-13 08:41:58 -05:00
DizzyEggg	5d958e245a	Merge pull request #2669 from Jaizu/giga_impact_contests ... Fix Giga Impact on contests.	2023-02-13 09:22:24 +01:00
Alex	2b32bfcdc1	add battlerId arg to ShowZMoveTriggerSprite	2023-02-12 19:39:14 +01:00
Eduardo Quezada	d699d55ba3	Reformatted gNatureStatTable	2023-02-12 01:19:03 -03:00
Eduardo Quezada	a937b3221a	Documented Ribbons	2023-02-11 23:16:24 -03:00
Eduardo Quezada	96865f66af	Updated term to modernFatefulEncounter	2023-02-11 22:36:42 -03:00
Eduardo Quezada	6da5e0a280	Rename eventLegal to fatefulEncounter	2023-02-11 17:13:53 -03:00
Alex	d363ed8152	z indicator in double battles	2023-02-11 19:55:08 +01:00
Alex	ce416be297	z_move switch move bug	2023-02-11 18:32:07 +01:00
sbird	4bcbb7c9e1	[intro] refactor expansion intro	2023-02-09 23:12:29 +01:00
ghoulslash	deb23fc7c6	Merge pull request #2648 from AlexOn1ine/pollen_puff ... Fixes Pollen Puff issue #2611	2023-02-09 08:21:33 -05:00
ghoulslash	27933836b5	Merge pull request #2662 from AlexOn1ine/heal_pulse_v2 ... Add Logic for Heal Pulse effects in double battles	2023-02-09 08:18:00 -05:00
Jaizu	9f7267e48d	Fix Giga Impact on contests.	2023-02-09 11:29:29 +01:00
GriffinR	c32fbf594a	Merge pull request #1851 from GriffinRichards/doc-fldspc ... Document remaining field_specials task data	2023-02-08 22:34:57 -05:00
GriffinR	de56e400ff	Sync clone object macro	2023-02-08 13:11:10 -05:00
Eduardo Quezada D'Ottone	8381b14c51	Implemented Xhyzi's RHH copyright intro (with config) (#2415) ... * Rhh & Pret Copyright Screen * Porygon recovered his voice * Expansion text --------- Co-authored-by: Xhyzi <xhyzdot@gmail.com> Co-authored-by: Jaizu <jaizu85@gmail.com>	2023-02-08 15:54:12 +01:00
Alex	41d64ea41e	heal pulse effect in double battles	2023-02-08 13:02:41 +01:00
DizzyEggg	84d7024add	cleanup	2023-02-08 12:48:48 +01:00
DizzyEggg	896b575c07	Fix volt switch breaking ace pokemon	2023-02-08 12:42:38 +01:00
DizzyEggg	8c257bde99	Fix 1 vs 2 battles with eggs	2023-02-08 10:24:19 +01:00
Eduardo Quezada	6c30c5490c	Test PR	2023-02-08 00:51:59 -03:00
DizzyEggg	ff088752e7	Insomnia ability pop-up (#2643) ... * Insomnia ability pop-up * remove B_MSG_STAYED_AWAKE_USING constant	2023-02-07 18:47:23 +01:00
Alex	5bf607049e	Fix Pollen Puff score	2023-02-07 16:41:30 +01:00
ghoulslash	7e9d40d401	Merge pull request #2645 from DizzyEggg/damp_aftermath ... Damp shows ability pop-up when reacting with Aftermath	2023-02-07 10:18:23 -05:00
DizzyEggg	0d6b640876	Merge pull request #2439 from AsparagusEduardo/RHH/pr/cleanup/DragonTailEffect ... Cleaned up move effect checks for Dragon Tail/Circle Throw	2023-02-07 16:17:12 +01:00
DizzyEggg	f762ed728d	remove pointless timers from disable struct	2023-02-07 15:10:20 +01:00
DizzyEggg	0dc5e1e685	aftermath damp pop-ups and string	2023-02-07 13:01:56 +01:00
ghoulslash	0c4c3fbbb7	Fix Poison Gas Anim for MOVE_TARGET_BOTH (#2608) ... * poison gas anim handles MOVE_TARGET_BOTH * fix sprite position fields * fix it again --------- Co-authored-by: ghoulslash <pokevoyager0@gmail.com>	2023-02-07 12:14:36 +01:00