16 Commits

Author	SHA1	Message	Date
scnorton	c6ff1a6ce3	Merge branch 'master' into link	2018-01-18 12:53:31 -05:00
DizzyEggg	05aba58d5d	fix battle transition conflicts	2018-01-14 22:19:26 +01:00
Diegoisawesome	e3585d7d66	Review fixes	2018-01-01 19:21:30 -06:00
DizzyEggg	ba176dfe07	start working on battle transition	2018-01-01 17:41:34 +01:00
Diegoisawesome	1496ea3a24	Merge branch 'master' of github.com:pret/pokeemerald	2017-12-28 03:00:15 -06:00
Diegoisawesome	2d04eb22ab	Split rom_81370FC and port function names	2017-12-28 02:09:11 -06:00
DizzyEggg	8cd4908fa3	merge bike with master, fix conflicts	2017-12-24 00:08:55 +01:00
DizzyEggg	6b5157b2a3	decompile bike.s	2017-12-21 17:46:03 +01:00
DizzyEggg	b615af4184	fix pokeblock merge conflicts	2017-12-20 17:16:56 +01:00
DizzyEggg	7581218569	Merge branch 'master' into decompile_battle1	2017-12-19 17:37:53 +01:00
DizzyEggg	cb229f56e8	fix pokeblock conflicts	2017-12-18 16:58:14 +01:00
DizzyEggg	eb8055eb07	battle 1 is decompiled	2017-12-17 20:10:57 +01:00
PikalaxALT	190a2cba61	Merge branch 'master' into link	2017-12-16 11:27:10 -05: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	00896cb3b5	rename rng.c to random.c and rom4.c to overworld.c	2017-12-05 12:27:33 -06:00