334 Commits

Author	SHA1	Message	Date
Eduardo Quezada D'Ottone	33ed87e2cb	Capitalization	2020-11-09 14:52:18 -03:00
Eduardo Quezada D'Ottone	3a984136e7	Updated comment.	2020-11-09 14:50:18 -03:00
Eduardo Quezada D'Ottone	df4d927e31	Moved BATTLE_ENGINE define to global.h to fix reading from other branches	2020-11-09 12:45:31 -03: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
ExpoSeed	bcfa79f4fb	Remove POKEMON_SLOTS_NUMBER define	2020-10-12 21:15:50 -05: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	da582d5258	Make JOY Macros match	2020-09-04 20:41:29 -04:00
DizzyEggg	f70a9ce153	Merge with master	2020-08-27 12:01:28 +02:00
GriffinR	22c1bf965a	Finish documenting berry blender	2020-08-24 17:06:55 -04:00
GriffinR	65bd2faf94	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest	2020-08-16 05:59:10 -04:00
GriffinR	463d79c7c1	Start documenting naming screen	2020-08-07 02:00:41 -04:00
GriffinR	52a4428ba6	Begin new contest documentation	2020-07-23 17:55:40 -04:00
DizzyEggg	62dc94e9c8	Merge with master	2020-07-15 10:13:19 +02:00
DizzyEggg	4c3f40a361	Merge with master	2020-07-11 12:59:23 +02:00
GriffinR	beeb673ba1	Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave	2020-07-08 16:03:32 -04:00
GriffinR	431c60c92c	Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti	2020-07-08 15:45:31 -04:00
GriffinR	06025e887f	Allow flag/var counts to be updated alongside values	2020-06-24 17:00:19 -04:00
GriffinR	24569583e4	Document contest results	2020-06-18 17:50:13 -04:00
GriffinR	7632404ba5	Document union_room_chat.c	2020-06-02 18:35:00 -04:00
DizzyEggg	013f9b6a17	merge wiith masteer and summary screen change	2020-05-29 12:50:54 +02:00
GriffinR	f9e6f7540f	Use fixed point macros for math util	2020-05-24 08:28:02 -05:00
DizzyEggg	e00b76b8da	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-04-15 13:31:52 +02:00
GriffinR	dde4a0416c	Label GCN link flags field	2020-04-13 08:42:31 -04:00
DizzyEggg	060b795d8e	Merge with master	2020-04-11 19:48:24 +02:00
Martin Griffin	4485d51522	Document decoration.c	2020-03-06 09:47:20 +00:00
DizzyEggg	108f6b711f	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2020-02-23 10:58:26 +01:00
DizzyEggg	d8aab3d112	Merge with master	2020-01-18 18:17:25 +01:00
GriffinR	655910a16f	Merge branch 'master' into fix-eventobj	2020-01-12 22:42:43 -05:00
GriffinR	ef67f2d33b	Merge master into ObjEvent rename and prune accidental inclusions	2020-01-08 05:43:06 -05:00
GriffinR	e5df61e362	Merge branch 'master' into doc-dome	2020-01-08 01:15:36 -05:00
DizzyEggg	4c9ea32d19	Merge with master	2019-12-30 18:52:23 +01:00
GriffinR	3efc8199d4	More battle_dome.c documentation	2019-12-25 22:27:33 -08:00
DizzyEggg	9e3d5672e6	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-12-23 16:40:21 +01:00
GriffinR	63c8cf97d1	Document Battle Dome scripts and some battle_dome.c	2019-12-20 16:53:33 -05:00
GriffinR	23f952b34e	Merge master into doc-tower	2019-12-17 21:17:46 -05:00
GriffinR	ddfa0c6298	Document Battle Tower scripts	2019-12-17 20:56:13 -05:00
GriffinR	db8a5c6c2b	Merge branch 'master' into fix-eventobj	2019-12-15 11:47:27 -05:00
GriffinR	47b0d8a597	Merge branch 'master' into doc-matchcall	2019-12-10 20:43:27 -05:00
DizzyEggg	ac499bc896	Merge with master	2019-12-09 08:16:18 +01:00
GriffinR	c51e0f3bae	Merge branch 'master' into fix-eventobj	2019-12-06 02:34:54 -05:00
GriffinR	be17c1602d	Set up remaining facility script doc, use Palace macros	2019-12-05 21:11:17 -06:00
GriffinR	548af3c0f1	Document a bit of Match Call	2019-12-05 15:33:36 -05:00
DizzyEggg	dcb5d16cb3	Merge with master	2019-11-29 21:47:31 +01:00
GriffinR	f559fa3fe2	Merge master into ObjEvent rename	2019-11-25 20:00:04 -05:00
GriffinR	0db46e84bc	Use macros for FRONTIER_DATA_6, fix offset comment	2019-11-25 18:37:48 -06:00
GriffinR	63ee15fc28	Document Frontier Util	2019-11-25 18:37:48 -06:00