290 Commits

Author	SHA1	Message	Date
ExpoSeed	208e0abe04	Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD	2020-12-31 18:44:43 -06:00
kageru	6f91f7e0e3	Use more constants in Battle Tower code	2020-11-17 17:40:26 +01:00
Eduardo Quezada D'Ottone	b19ee3c554	Capitalization.	2020-11-09 14:53:10 -03:00
Eduardo Quezada D'Ottone	102e686a94	Updated comment.	2020-11-09 14:48:47 -03:00
Eduardo Quezada D'Ottone	bacabf03a8	Review changes.	2020-11-09 13:45:08 -03:00
Eduardo Quezada D'Ottone	b4cf674fa1	Moved ITEM_EXPANSION define to global.h to fix reading from other branches like Battle Engine	2020-11-09 12:38:53 -03:00
aaaaaa123456789	1c3d75f673	Merge branch 'master' into reverts	2020-10-26 12:16:36 -03: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
PokeCodec	da582d5258	Make JOY Macros match	2020-09-04 20:41:29 -04: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
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
GriffinR	f9e6f7540f	Use fixed point macros for math util	2020-05-24 08:28:02 -05:00
GriffinR	dde4a0416c	Label GCN link flags field	2020-04-13 08:42:31 -04:00
Martin Griffin	4485d51522	Document decoration.c	2020-03-06 09:47:20 +00: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
GriffinR	3efc8199d4	More battle_dome.c documentation	2019-12-25 22:27:33 -08: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
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
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
GriffinR	4dfa959fa2	Begin documenting Battle Pike and Frontier Util	2019-11-25 18:37:48 -06:00
GriffinR	82cb741d8b	Standardize EVENT_OBJECT to OBJECT_EVENT	2019-11-20 23:12:51 -05:00
GriffinR	ec3e86f1d2	Standardize Event Object to Object Event	2019-11-20 22:55:44 -05:00
GriffinR	b2eb49888d	Clean up Apprentice doc	2019-11-20 19:00:08 -05:00
GriffinR	a05006421b	Document Apprentice	2019-11-20 17:36:52 -05:00
GriffinR	4e6a69c297	WIP Document Apprentice	2019-11-19 11:36:38 -05:00
GriffinR	a486c8affd	Begin documenting Apprentice, merge with master	2019-11-18 12:47:10 -05:00
GriffinR	b96fad074b	Rename neverRead fields	2019-11-16 13:02:35 -06:00
GriffinR	5e01871f8b	Document Trainer Hill	2019-11-16 13:02:35 -06:00
GriffinR	fc3783b739	WIP Document apprentice	2019-11-16 12:28:49 -05:00
GriffinR	27169f634b	Review changes for party menu doc	2019-10-31 21:33:01 -04:00
GriffinR	973e6f9667	Document mauville_man.inc	2019-10-21 17:21:53 -05:00
GriffinR	945d3d3a27	Merge branch 'master' into document-eventscripts	2019-09-17 00:10:23 -04:00