32 Commits

Author	SHA1	Message	Date
ultima-soul	2a20d50904	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-02-01 15:54:08 -08:00
GriffinR	564278fd49	Document battle tv data	2021-01-14 06:29:59 -05:00
GriffinR	b9e1b050e1	Label remaining battle types	2021-01-13 15:20:29 -05:00
ultima-soul	99fdc13e61	Merge branch 'master' into battle_engine_sync	2020-11-07 15:59:20 -08:00
aaaaaa123456789	1c3d75f673	Merge branch 'master' into reverts	2020-10-26 12:16:36 -03:00
Kurausukun	36d7e8c769	re-match TryPutLinkBattleTvShowOnAir (from #1177)	2020-10-23 21:04:28 -04:00
ExpoSeed	9e2c8a95c1	Sync bev2 with pret	2020-10-11 01:01:47 -05:00
GriffinR	5259898325	Replace POKEMON_SLOTS_NUMBER	2020-10-01 17:07:12 -05: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
PokeCodec	d4158e490a	Match more functions	2020-09-04 19:49:53 -04:00
DizzyEggg	f70a9ce153	Merge with master	2020-08-27 12:01:28 +02:00
GriffinR	5e8ffff62f	Add stat stage constants	2020-08-04 20:38:57 -04:00
DizzyEggg	d39b5f6d26	Fix messing with move result flags when not needed	2019-04-02 00:14:01 +02:00
DizzyEggg	944dc4f6bf	Merge with master	2019-04-01 13:40:42 +02:00
Marcus Huderle	462b196abc	Give battle_anim files appropriate names	2019-03-31 12:15:39 -05:00
DizzyEggg	517573eb4b	Update with master	2018-12-26 17:46:51 +01:00
melthelesbian	2dd706ca54	use max mon moves constant where able (#480) ... * use max mon moves constant where able * fix errors in script commands file * fix more errors	2018-12-25 11:50:15 -06:00
DizzyEggg	180aa839c4	Fix conflicts	2018-12-09 13:12:02 +01:00
nullableVoidPtr	f9ff7316d5	Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs	2018-12-06 10:38:28 +08:00
nullableVoidPtr	3909b6408c	Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 ... Some of the INVALID_ are likely erroneously placed, due to lack of documentation	2018-12-06 09:44:08 +08:00
DizzyEggg	b3ad32bbe6	Merge with master	2018-10-14 20:51:34 +02:00
DizzyEggg	ecdf0fd69d	Clean battle structs	2018-10-14 18:37:52 +02:00
DizzyEggg	45bc76d94c	Side Status from u16 to u32	2018-07-24 20:13:02 +02:00
DizzyEggg	5a38bb61db	Basic damage calc is ready.	2018-07-14 22:56:03 +02:00
DizzyEggg	c00fa14b66	Create template of new dmg calc	2018-07-14 19:29:25 +02:00
DizzyEggg	d2e47323fe	document frontier related	2018-07-01 11:15:42 +02:00
DizzyEggg	bfc64c9689	C vars sym ewram	2018-06-30 15:35:54 +02:00
Diegoisawesome	23b050a99e	Update naked attribute and ASM_DIRECT to NAKED macro	2018-05-11 17:24:32 -05:00
DizzyEggg	20baa1bc7a	battle tv review changes	2018-03-01 01:05:34 +01:00
DizzyEggg	d29b9d268f	make it compile	2018-02-28 00:18:59 +01:00
DizzyEggg	59ff4aec9b	decompile and document battle tv	2018-02-27 20:40:09 +01:00