4847 Commits

Author	SHA1	Message	Date
ProjectRevoTPP	7dd75f453d	merge	2017-12-25 00:05:39 -05:00
DizzyEggg	9ee677d567	commit	2017-12-24 19:08:55 +01:00
DizzyEggg	43f23b8a78	Merge branch 'master' into dump_pointers	2017-12-24 11:15:00 +01:00
DizzyEggg	8cd4908fa3	merge bike with master, fix conflicts	2017-12-24 00:08:55 +01:00
DizzyEggg	e647cb2308	dump start menu and a bit of textwindow and trainercard	2017-12-23 19:23:55 +01:00
DizzyEggg	4f6ca126b5	dump all rayquaza scene data to C	2017-12-23 13:23:23 +01:00
ProjectRevoTPP	3499ff51b5	second wave of graphics.s dumps (battle_anim part 1)	2017-12-23 01:45:04 -05:00
DizzyEggg	e7111984a9	start rayquaza dumping	2017-12-23 00:22:07 +01:00
DizzyEggg	3ca5af4d5d	do some pointer storage system hunting	2017-12-22 20:10:51 +01:00
DizzyEggg	9c45ca0c5f	dump pokemon icon	2017-12-22 19:16:15 +01:00
DizzyEggg	08ebf59e44	get rid of pointers in pokedex	2017-12-22 18:43:41 +01:00
DizzyEggg	cddd44834e	Merge branch 'master' into dump_pointers	2017-12-22 16:22:16 +01: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
DizzyEggg	19c25a8f2b	start dumping pokedex	2017-12-21 22:56:20 +01: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	6b5157b2a3	decompile bike.s	2017-12-21 17:46:03 +01: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
scnorton	3c2b1731ee	Merge branch 'master' into link	2017-12-17 14:09:06 -05:00
PikalaxALT	5b526906e1	through sub_800F0F8	2017-12-16 12:07:20 -05:00
PikalaxALT	190a2cba61	Merge branch 'master' into link	2017-12-16 11:27:10 -05: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