1584 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DizzyEggg	a612ef12a0	start working on trainer see	2017-12-18 19:35:50 +01:00
DizzyEggg	cb229f56e8	fix pokeblock conflicts	2017-12-18 16:58:14 +01:00
Diegoisawesome	6a674e1e83	Merge remote-tracking branch 'Egg/decompile_mail_data'	2017-12-17 22:51:40 -06:00
DizzyEggg	314b96af46	static names given s prefix	2017-12-17 23:45:27 +01:00
Remy Oukaour	a0ad3ae720	* Use the $^ automatic variable for Castform files to avoid repetition ... * Use static pattern rules for png->otherextension to avoid repetition * Multi-use directories are declared at the top; single-use directories do not use variables	2017-12-17 16:45:58 -05:00
Remy Oukaour	9301016f40	INSTALL.md links to pret/pokeruby-tools, since YamaArashi/pokeruby-tools and ProjectRevoTPP/pokeruby-tools are 404	2017-12-17 16:39:01 -05:00
DizzyEggg	720bd555bc	add constants trainers file	2017-12-17 21:19:08 +01:00
DizzyEggg	54dccc8512	give batter script command names	2017-12-17 20:38:01 +01:00
DizzyEggg	7517f6a030	fix battle setup conflicts	2017-12-17 20:26:13 +01:00
DizzyEggg	46fa2557d7	merge mail with master, fix conflicts	2017-12-17 20:22:56 +01:00
DizzyEggg	eb8055eb07	battle 1 is decompiled	2017-12-17 20:10:57 +01:00
PikalaxALT	6d73bb4b57	Import function labels from Ruby	2017-12-16 10:23:05 -05:00
DizzyEggg	c3abe2863f	rename	2017-12-16 15:12:55 +01:00
DizzyEggg	5b409d49ed	pokeblock.s is decompiled	2017-12-16 15:10:29 +01:00
DizzyEggg	f4ab21ee67	Merge branch 'master' into decompile_use_pokeblock	2017-12-16 11:42:59 +01:00
PikalaxALT	da2e0dfe50	Merge branch 'master' into clock	2017-12-15 21:04:25 -05:00
DizzyEggg	930fea6fad	mail review changes	2017-12-16 01:18:31 +01:00
DizzyEggg	bb82032208	battle setup review changes	2017-12-16 01:15:19 +01:00
DizzyEggg	44abbae60b	nerge with master, fix conflicts	2017-12-16 01:08:55 +01:00
DizzyEggg	4351676749	decompile more of pokeblock.s	2017-12-16 00:08:23 +01:00
Diegoisawesome	224fdbf026	Merge pull request #138 from Diegoisawesome/master ... Rename some symbols and add languages	2017-12-15 00:38:21 -06:00
Diegoisawesome	e3c366df64	Merge remote-tracking branch 'pret/master'	2017-12-15 00:08:48 -06:00
Avara	c8ac4e8ce4	Opponents fixed and moved~	2017-12-12 02:58:57 +00:00
Cameron Hall	c9f196cdfe	Merge pull request #137 from camthesaxman/constants_headers ... move constants to C headers	2017-12-11 12:45:08 -06:00
camthesaxman	9525fdd54d	convert more constants	2017-12-11 12:41:13 -06:00
camthesaxman	c681b482c2	convert more constants	2017-12-11 12:27:51 -06:00
DizzyEggg	8ac17e0948	move data from asm to pokeblock.c	2017-12-11 16:52:28 +01:00
Avara	0c20cd6990	Opponent Constants	2017-12-11 14:37:13 +00:00
DizzyEggg	b4d10ab7ab	split pokeblock files	2017-12-10 19:02:51 +01:00
DizzyEggg	37ae6a7758	move more pokeblock data to C and label	2017-12-10 16:38:27 +01:00
DizzyEggg	fb30acbc30	pokeblock feed is decompiled	2017-12-10 15:04:03 +01:00
DizzyEggg	bb1ae5f857	Merge branch 'master' into decompile_use_pokeblock	2017-12-09 21:24:47 +01:00
DizzyEggg	6561b62986	start pokeblock feed	2017-12-09 21:23:40 +01:00
camthesaxman	19fbf024ff	fix merge conflicts	2017-12-05 12:42:30 -06:00
camthesaxman	00896cb3b5	rename rng.c to random.c and rom4.c to overworld.c	2017-12-05 12:27:33 -06:00
Cameron Hall	fd75493bc6	Merge pull request #129 from DizzyEggg/dumb_naming ... Name some battle labels	2017-12-05 12:05:06 -06:00
Cameron Hall	7597433af6	Merge pull request #130 from DizzyEggg/decompile_pokeball ... Decompile pokeball	2017-12-05 11:57:54 -06:00
camthesaxman	caa13f8777	convert some constants to C headers	2017-12-05 11:55:48 -06:00
DizzyEggg	ddcf52bcae	get rid of ball pal files	2017-12-04 23:22:48 +01:00
EternalCode	266dd492a7	void parameter in function header	2017-12-04 17:12:05 -05:00
DizzyEggg	ad07843f2d	start working on use pokeblock	2017-12-04 23:09:44 +01:00
xenonnsmb	e649e3d248	adding tools from pokeruby	2017-12-03 19:55:01 -06:00
EternalCode	d74c0d053e	missed moving an extern to top	2017-12-03 20:48:08 -05:00
EternalCode	077089f0e5	fldeff_teleport file completed	2017-12-03 20:46:56 -05:00
xenonnsmb	eeaa59d837	Add install info from pokeruby repo.	2017-12-03 19:45:03 -06:00
xenonnsmb	42119b9e1b	Create build_tools.sh	2017-12-03 19:42:55 -06:00
DizzyEggg	4faa442d5a	decompile and label mail	2017-12-03 19:19:11 +01:00
DizzyEggg	790df7159e	more battlescript labels	2017-12-03 00:47:21 +01:00
DizzyEggg	e10aea9a51	give some more labels to battle struct fields	2017-12-02 23:31:58 +01:00
DizzyEggg	ce6e97fa0b	sprite data fields to array	2017-12-02 21:44:50 +01:00