5291 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
huderlem	fa5816915d	Merge pull request #949 from GriffinRichards/doc-dome ... Document Battle Dome and add facility party constants	2020-01-12 20:10:03 -06:00
GriffinR	43962fe141	Fix BuffeInGameTradeMonName typo	2020-01-12 19:45:04 -06:00
GriffinR	10220d3b76	Label TryRecordMixLinkup	2020-01-12 19:39:30 -06:00
GriffinR	e736c2d2fd	Document some easy chat specials	2020-01-12 19:39:30 -06:00
GriffinR	c27a4778ee	Standardize prebattle -> intro	2020-01-12 19:39:30 -06:00
GriffinR	6a470ddfda	Some script clean up, document secret base secrets show	2020-01-12 19:39:30 -06:00
GriffinR	e497fc64e3	if_undefeated macro to if_not_defeated	2020-01-12 20:20:02 -05:00
GriffinR	0284014e0e	Add missing save status use	2020-01-12 18:42:41 -06:00
GriffinR	58e64b9524	Clean up some of save.c	2020-01-12 18:42:41 -06:00
GriffinR	f2e7b1507e	Port some macro/script fixes from pokefirered	2020-01-11 14:12:31 -05:00
PikalaxALT	de49445a79	Merge pull request #952 from PikalaxALT/real_match_8072308 ... Match sub_8072308	2020-01-10 17:39:18 -05:00
PikalaxALT	98b2ab9a77	Match sub_8072308	2020-01-10 16:38:47 -05:00
GriffinR	635267ce32	Merge branch 'master' into fix-eventobj	2020-01-08 05:51:49 -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	017fa294b5	Add battle tent mon/trainer constants	2020-01-08 01:07:53 -05:00
GriffinR	fb5bea98ce	More battle_dome.c doc	2020-01-07 22:30:37 -05:00
Slawter666	8b1595ebc3	Pokédex search menu documentation	2020-01-06 15:18:58 -06:00
GriffinR	c85ca4b860	Standardize farfetchd spelling	2020-01-06 15:17:11 -06:00
GriffinR	379f7f5149	Add braces to trainer party moves	2020-01-06 15:16:49 -06:00
GriffinR	bb692a03eb	Add frontier mon constants	2020-01-03 23:20:11 -05:00
Marcus Huderle	ef751c8d1b	Fix formatting and remove unnecessary comments	2019-12-28 12:07:02 -06:00
huderlem	3b05398975	Merge pull request #945 from Fontbane/patch-5 ... Give rival and Maxie parties better names	2019-12-28 12:06:35 -06:00
GriffinR	3efc8199d4	More battle_dome.c documentation	2019-12-25 22:27:33 -08:00
Fontbane	31b4656324	Labels better	2019-12-25 22:39:06 -05:00
Fontbane	2e8c20d72f	Update trainers.h	2019-12-25 20:48:40 -05:00
huderlem	8d64bc9df8	Merge pull request #944 from GriffinRichards/doc-itemuse ... Document item_use.c	2019-12-25 11:59:07 -06:00
huderlem	ee61726136	Merge pull request #936 from GriffinRichards/doc-tower ... Document Battle Tower scripts	2019-12-25 11:39:20 -06:00
DizzyEggg	9a2888fdbf	Merge into master	2019-12-23 16:46:03 +01:00
AJ Fontaine	b80fa767ab	Give rivals and Maxie battles better names ... Name describes where the battle is and for rivals, which starter the player chose.	2019-12-23 10:42:06 -05:00
GriffinR	749965d56b	Document item_use.c	2019-12-21 21:39:30 -05:00
GriffinR	68cdd7b1cb	Merge master into ObjEvent rename	2019-12-21 05:19:27 -05:00
Diegoisawesome	026e1108b2	Merge pull request #935 from GriffinRichards/doc-warp ... Document some warp/field screen effect	2019-12-20 23:44:56 -08:00
Diegoisawesome	d42ea06dc5	Merge pull request #939 from GriffinRichards/fix-compare ... Use constants in compare macro	2019-12-20 23:40:12 -08:00
Diegoisawesome	e4e3d439dc	Merge pull request #941 from GriffinRichards/fix-lastresult ... Remove references to LASTRESULT	2019-12-20 23:38:56 -08:00
Diegoisawesome	4e10133545	Merge pull request #940 from Kurausukun/master ... update instrument sample names	2019-12-20 23:38:30 -08:00
GriffinR	ff2d8a9c4e	Add frontier trainer constants	2019-12-20 21:14:05 -05:00
GriffinR	324a81ed5d	Reword yesnobox comment	2019-12-20 18:53:58 -05:00
Diegoisawesome	773a599bbb	Merge pull request #942 from jiangzhengwenjz/DrawTradeMenuPartyInfo ... 'real' match DrawTradeMenuPartyInfo	2019-12-20 15:49:14 -08:00
Diegoisawesome	929a093fc1	Merge pull request #943 from jiangzhengwenjz/CanSpinTradeMon ... real match CanSpinTradeMon	2019-12-20 15:49:05 -08:00
jiangzhengwenjz	4d8ea3a2d9	CanSpinTradeMon	2019-12-21 06:18:20 +08:00
jiangzhengwenjz	681d929892	DrawTradeMenuPartyInfo	2019-12-21 06:09:59 +08:00
GriffinR	63c8cf97d1	Document Battle Dome scripts and some battle_dome.c	2019-12-20 16:53:33 -05:00
GriffinR	7628019952	Remove references to LASTRESULT	2019-12-20 08:51:58 -05:00
Kurausukun	3a7bb65077	update instrument sample names	2019-12-19 03:42:09 -05:00
GriffinR	9e08cfe55f	Remove uses of compare_var_to	2019-12-18 19:22:39 -05:00
GriffinR	d137a1a0c1	Use constants in compare macro	2019-12-18 19:12:09 -05:00
Diegoisawesome	3b240b2ad4	Merge pull request #938 from pret/ubuntu_bionic ... Bump travis to bionic (Ubuntu 18.04 LTS)	2019-12-18 13:32:25 -08:00
GriffinR	949509aade	Merge branch 'master' into fix-eventobj	2019-12-18 13:16:38 -05:00
PikalaxALT	5f1c7c9e93	Bump travis to bionic (Ubuntu 18.04 LTS)	2019-12-18 13:03:00 -05:00