4941 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
GriffinR	6556b556dd	Merge branch 'master' into fix-eventobj	2019-12-11 01:09:06 -05:00
GriffinR	49f1a90534	Document Battle Pike scripts	2019-12-10 19:31:27 -06:00
GriffinR	b7ab9cbf4c	Update JP translation and fix typo	2019-12-10 19:29:23 -06:00
GriffinR	ed1ff0ad77	Document misc strings and text colors	2019-12-10 19:29:23 -06:00
GriffinR	fe16452999	Typo fix	2019-12-10 19:28:16 -06:00
GriffinR	fcd8d37d62	Document Battle Palace scripts	2019-12-10 19:28:16 -06:00
GriffinR	8da7a94423	Merge branch 'master' into fix-eventobj	2019-12-10 17:41:08 -05:00
Diegoisawesome	49b56d0136	Merge pull request #929 from jiangzhengwenjz/nonmatching ... fake match InitEventObjectStateFromTemplate	2019-12-10 14:32:57 -08:00
jiangzhengwenjz	f34b8f564a	InitEventObjectStateFromTemplate	2019-12-11 05:35:40 +08:00
GriffinR	b93101bbeb	Merge master into ObjEvent rename	2019-12-06 21:37:33 -05:00
Slawter666	47ea65b96e	Requested changes	2019-12-06 19:06:21 -06:00
Slawter666	9fc176f272	Document pokedex info page	2019-12-06 19:06:21 -06:00
GriffinR	05af6b467c	Fix Subsprite formatting	2019-12-06 19:05:44 -06:00
GriffinR	c26e8b8ddb	More SPRITE macro usage	2019-12-06 19:05:44 -06:00
GriffinR	2756771958	More usage of ST_OAM constants and SPRITE macros	2019-12-06 19:05:44 -06:00
GriffinR	c40879aa36	Use ST_OAM constants for OamData definitions	2019-12-06 19:05:44 -06:00
GriffinR	22fd579fd9	Add comment for ABNORMAL_WEATHER	2019-12-06 19:05:28 -06:00
GriffinR	7f22fc9879	Update old weather names in field_weather_effect	2019-12-06 19:05:28 -06:00
GriffinR	955bfe3f5c	Add comment for original weather name	2019-12-06 19:05:28 -06:00
GriffinR	efaea2a3ab	Revert WEATHER_CLOUDY to WEATHER_SHADE	2019-12-06 19:05:28 -06:00
GriffinR	a4191040c9	Sync weather names	2019-12-06 19:05:28 -06:00
GriffinR	1b30f0c973	Rename event_obj_lock to event_object_lock	2019-12-06 02:55:30 -05:00
GriffinR	c51e0f3bae	Merge branch 'master' into fix-eventobj	2019-12-06 02:34:54 -05:00
GriffinR	7beddd16dd	Document missed scripts/text	2019-12-05 21:20:55 -06:00
GriffinR	49c6ae1ac6	Add some macro comments	2019-12-05 21:11:17 -06:00
GriffinR	467a103bcc	Set up Battle Tent macros	2019-12-05 21:11:17 -06:00
GriffinR	fdae25eab2	Set up Battle Pyramid macros	2019-12-05 21:11:17 -06:00
GriffinR	9fcfbdbef5	Set up Battle Factory macros	2019-12-05 21:11:17 -06:00
GriffinR	41c1c9ca8a	Set up Battle Pike macros	2019-12-05 21:11:17 -06:00
GriffinR	9b3d1cfab6	Set up Battle Dome and Tower macros	2019-12-05 21:11:17 -06:00
GriffinR	be17c1602d	Set up remaining facility script doc, use Palace macros	2019-12-05 21:11:17 -06:00
Diegoisawesome	809811e722	Merge pull request #917 from GriffinRichards/fix-stringptr ... Fix hard-coded string ptr	2019-11-28 23:53:26 -06:00
GriffinR	df1fce705c	Fix hard-coded string ptr	2019-11-29 00:10:55 -05:00
Diegoisawesome	c14e2cdbe2	Merge pull request #916 from Fontbane/patch-3 ... Fix Hondrew Berry typo	2019-11-28 09:35:09 -08:00
AJ Fontaine	2d1a780dd8	Fix Hondrew Berry typo	2019-11-28 11:44:13 -05:00
GriffinR	cb90f22c5e	Merge master into ObjEvent rename	2019-11-27 12:51:10 -05:00
GriffinR	70d1f54ab9	Remove TODO comment for battle arena macros	2019-11-26 18:47:48 -06:00
GriffinR	8d870d94c9	Document Battle Arena scripts	2019-11-26 18:47:48 -06:00
GriffinR	f559fa3fe2	Merge master into ObjEvent rename	2019-11-25 20:00:04 -05:00
PikalaxALT	6efa51f8ad	Bump discord invite ... New invite link points to landing channel	2019-11-25 18:38:13 -06:00
GriffinR	0db46e84bc	Use macros for FRONTIER_DATA_6, fix offset comment	2019-11-25 18:37:48 -06:00
GriffinR	cc81b5032b	Split frontier macros and comment frontier_util.inc	2019-11-25 18:37:48 -06:00
GriffinR	63ee15fc28	Document Frontier Util	2019-11-25 18:37:48 -06:00
GriffinR	08a8dc46e3	Use macros for Trainer Hill	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	cfdde42b00	Name text speed delays	2019-11-25 09:16:05 -06:00
huderlem	9a81661075	Merge pull request #851 from Sewef/patch-3 ... battle_anim_effects_3	2019-11-24 12:02:54 -06:00
Sewef	07b79c3fc3	battle_anim_effects_3 (5)	2019-11-24 18:00:51 +01:00
huderlem	bef6150b59	Merge pull request #909 from GriffinRichards/doc-apprentice ... Document Apprentice	2019-11-23 09:27:02 -06:00
GriffinR	f039e897ca	Use APPRENTICE_COUNT for record_mixing mod	2019-11-23 10:11:05 -05:00