74 Commits

Author	SHA1	Message	Date
ultima-soul	5bab9474dc	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-03-22 23:08:19 -07:00
Marcus Huderle	a85fada314	Document more battle anim effects	2021-02-28 09:54:55 -06:00
GriffinR	3fd5e143a9	Misc battle anim documentation	2021-01-23 00:40:46 -05:00
Evan	99d9a36860	add totem boosts	2020-11-19 10:35:37 -07:00
ultima-soul	99fdc13e61	Merge branch 'master' into battle_engine_sync	2020-11-07 15:59:20 -08:00
aaaaaa123456789	7dc95a0103	Undo PokeCodec's PRs ... This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183.	2020-09-13 06:30:55 -03:00
DizzyEggg	97d0643110	Merge with master	2020-09-08 12:48:28 +02:00
DizzyEggg	f70a9ce153	Merge with master	2020-08-27 12:01:28 +02:00
GriffinR	3014241179	Give songs meaningful english names	2020-08-20 19:06:14 -04:00
DizzyEggg	11178a49db	Fix undefined behaviour in protect animation ... gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1] The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.	2020-07-27 13:17:18 -04:00
PokeCodec	ddd012f3ed	holding back on casts	2020-07-27 12:47:08 -04:00
DizzyEggg	0066640a1e	Merge with master	2020-07-27 14:51:39 +02:00
DizzyEggg	f007165c53	Fix undefined behaviour in protect animation ... gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1] The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.	2020-07-27 12:27:35 +02:00
PokeCodec	c5aa91741b	Change signedness and add casts to avoid implicit conversion warnings	2020-07-24 22:18:57 -04:00
Evan	fdc6e80e1e	fix anim defines	2020-05-28 12:19:07 -06:00
Evan	6c20a49dc6	animations for all moves	2020-05-25 00:37:32 -06:00
Philipp AUER	f1f4000914	anim: add some animation moves (#383) ... - fell stinger - draining kiss - kings shield (==protect) - scald - fire pledge - water pledge - grass pledge Co-authored-by: SBird <sbird@no.tld>	2020-05-24 18:14:59 +02:00
ghoulslash	13cf2cb217	Animation Particles, BGs, and gen 4 anims (#384) ... * undo some revert(?) * cfru particles and bgs * remove commented out particles	2020-05-24 18:13:40 +02:00
DizzyEggg	6968124529	Merge battle anim documentation	2020-02-29 13:59:41 +01:00
GriffinR	51cd0ac081	Rename battle anim type files, remove unneeded ARG_RET_IDs	2020-02-25 12:54:08 -06:00
GriffinR	68dc68907b	Label move anim data	2020-02-25 12:54:08 -06:00
GriffinR	efd53d080c	Clean up battle anim C for doc	2020-02-25 12:54:08 -06:00
GriffinR	afa1ae2209	Finish documenting move anim scripts	2020-02-25 12:54:08 -06:00
GriffinR	0d651c7c9e	Some battle anim review changes	2020-02-25 12:54:08 -06:00
GriffinR	1ba12dc050	Document move anims I-S	2020-02-25 12:54:08 -06:00
DizzyEggg	ac499bc896	Merge with master	2019-12-09 08:16:18 +01:00
GriffinR	2756771958	More usage of ST_OAM constants and SPRITE macros	2019-12-06 19:05:44 -06:00
DizzyEggg	1d8cc9b741	Fix merge conflicts	2019-11-03 19:55:19 +01:00
Sewef	e9675bdd24	battle_anims_effects_2	2019-10-20 12:29:08 -05:00
DizzyEggg	e736c369d6	Merge with master	2019-10-19 17:47:55 +02:00
Sewef	ed1f5a7455	Conflits 3/2 ... Nice one, git	2019-10-16 19:32:02 +02:00
Sewef	c280d0e00e	Another fix, Conflicts 2/2	2019-10-16 19:26:08 +02:00
Sewef	e7d36a76e1	Forgotten fix, conflits 1/2	2019-10-16 19:21:58 +02:00
Sewef	9dcfc5ba73	Fix labels	2019-10-16 19:10:39 +02:00
Sewef	8dacb53029	Update battle_anim_effects_1.c	2019-10-14 23:31:29 +02:00
Sewef	975c0ce1d0	Label battle_anim_effects_1	2019-10-14 23:27:12 +02:00
Sewef	65b82d67c9	Revert "More battle_anim_effects_1 labels" ... This reverts commit 00331a644a.	2019-10-14 23:22:44 +02:00
Sewef	5a366e8d72	More battle_anim_effects_1 labels	2019-10-14 22:51:45 +02:00
Sewef	00331a644a	More battle_anim_effects_1 labels	2019-10-14 22:42:15 +02:00
Sewef	299166edee	Document subs & AnimTask in battle_anim_effects_1	2019-10-14 22:08:03 +02:00
Sewef	46f2cc5449	battle_anim_effects_1 main callbacks	2019-10-14 21:17:38 +02:00
Sewef	63b5be9259	Ended battle_anims_effects_1 SpriteTemplates	2019-10-14 21:05:40 +02:00
Sewef	ddd4639b82	Started labelling battle_anim_effects_1	2019-10-13 22:35:31 +02:00
DizzyEggg	bae5d2038f	Update with master	2019-10-10 16:18:48 +02:00
PikalaxALT	306ce048ad	Move gflib srcs and headers to gflib subdir	2019-09-08 21:07:54 -04:00
GriffinR	4a0cad80b0	Use B_SIDE constants ... Also includes a CHAR_X constant use for X items	2019-09-04 17:06:59 -04:00
DizzyEggg	e96e98a8de	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-08-25 13:10:32 +02:00
PikalaxALT	5b8d0f1c33	Remove MNUM from oam flip constant names	2019-08-21 17:15:23 -05:00
PikalaxALT	f7cf4fa154	Use HFLIP, VFLIP	2019-08-21 17:15:23 -05:00
DizzyEggg	c219776034	Merge with master	2019-08-04 23:09:28 +02:00