943 Commits

Author	SHA1	Message	Date
Diegoisawesome	f9a9391ff3	Split/extract/port landmark	2017-12-26 21:20:29 -06:00
Diegoisawesome	15c92318d3	Extract data from misc files ... Also split data4d.s	2017-12-25 00:32:01 -06:00
Diegoisawesome	4a4a10a990	Merge remote-tracking branch 'pret/master'	2017-12-22 03:10:09 -06:00
Diegoisawesome	841ee0f2b2	Fix pokeblock songs include	2017-12-22 03:06:57 -06:00
sceptillion	3c286feec6	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs	2017-12-22 00:17:34 -08:00
sceptillion	96511dc214	use internal song names	2017-12-22 00:10:20 -08:00
Diegoisawesome	6bd6cfcac7	Merge remote-tracking branch 'pret/master'	2017-12-22 01:22:16 -06:00
Diegoisawesome	0e8d6645f8	Attempts to fix nonmatchings in palette.c	2017-12-22 01:03:16 -06:00
Diegoisawesome	0403f6eea9	Merge remote-tracking branch 'Egg/decompile_use_pokeblock'	2017-12-21 16:19:50 -06:00
DizzyEggg	bcffcb0c1c	pokeblock merge conflicts	2017-12-21 23:12:36 +01:00
Diegoisawesome	2c0e5a41a2	Merge remote-tracking branch 'Shanty/script_macros'	2017-12-21 16:03:37 -06:00
Marcus Huderle	173761a5a1	Port generic event script macros from pokeruby	2017-12-21 13:47:52 -06:00
Diegoisawesome	a705a863d1	Fix incorrect slash in battle_bg.c	2017-12-21 12:26:00 -06:00
DizzyEggg	504363f2a6	Merge branch 'master' into decompile_trainer_see	2017-12-20 17:21:46 +01:00
DizzyEggg	df479661ff	pokeblock review changes	2017-12-20 17:20:41 +01:00
DizzyEggg	b615af4184	fix pokeblock merge conflicts	2017-12-20 17:16:56 +01:00
Diegoisawesome	7e6a68a99a	Merge remote-tracking branch 'Egg/static_to_s'	2017-12-20 00:25:54 -06:00
DizzyEggg	4949411f3e	make battle bg compile	2017-12-19 17:41:05 +01:00
DizzyEggg	7581218569	Merge branch 'master' into decompile_battle1	2017-12-19 17:37:53 +01:00
DizzyEggg	4abc2eea8a	ram vars to C files	2017-12-19 17:33:07 +01:00
DizzyEggg	b7a2335347	clean up trainer see file	2017-12-19 17:18:44 +01:00
DizzyEggg	5744356989	decompile trainer see	2017-12-18 23:26:44 +01:00
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
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
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
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