1345 Commits

Author	SHA1	Message	Date
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	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	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	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	190a2cba61	Merge branch 'master' into link	2017-12-16 11:27:10 -05:00
DizzyEggg	c3abe2863f	rename	2017-12-16 15:12:55 +01:00
PikalaxALT	da2e0dfe50	Merge branch 'master' into clock	2017-12-15 21:04:25 -05:00
DizzyEggg	44abbae60b	nerge with master, fix conflicts	2017-12-16 01:08:55 +01: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
PikalaxALT	dc0d544119	sub_800E87C, remaining data in link_rfu	2017-12-05 23:54:31 -05:00
camthesaxman	00896cb3b5	rename rng.c to random.c and rom4.c to overworld.c	2017-12-05 12:27:33 -06:00
DizzyEggg	ad07843f2d	start working on use pokeblock	2017-12-04 23:09:44 +01:00
EternalCode	077089f0e5	fldeff_teleport file completed	2017-12-03 20:46:56 -05:00
PikalaxALT	519c8d42f8	through sub_800DD94	2017-12-03 20:04:54 -05:00
DizzyEggg	4faa442d5a	decompile and label mail	2017-12-03 19:19:11 +01:00
DizzyEggg	2fe25da65a	move pokeball data to rom	2017-12-02 21:27:00 +01:00
DizzyEggg	c2fdde3a49	pokeball file is decompiled	2017-12-02 20:38:26 +01:00
DizzyEggg	c27f7a8131	start working on pokeball	2017-12-02 19:39:07 +01:00
DizzyEggg	039c9f4bd8	merge with master	2017-12-01 21:27:29 +01:00
DizzyEggg	646664ff29	battle setup file is decompiled	2017-12-01 21:25:13 +01:00
PikalaxALT	10068b0345	Merge branch 'master' into field_poison	2017-11-29 08:19:54 -05:00
DizzyEggg	10470ef536	start working on battle setup	2017-11-28 23:02:09 +01:00
Diegoisawesome	54da963091	Merge pull request #122 from PikalaxALT/unk_81BAD84 ... Unk 81 bad84	2017-11-28 10:11:49 -06:00
PikalaxALT	88636dfc2a	Merge branch 'master' into clock	2017-11-27 20:09:53 -05:00
PikalaxALT	b9d08ed83b	Merge branch 'master' into unk_81BAD84	2017-11-27 20:08:34 -05:00
PikalaxALT	1ac177723d	Merge branch 'master' into field_poison	2017-11-27 20:07:33 -05:00
PikalaxALT	41eb2ed59e	Merge branch 'master' into coins	2017-11-27 20:06:38 -05:00
PikalaxALT	cbd2718b5e	Merge branch 'master' into link	2017-11-27 20:05:51 -05:00
Diegoisawesome	18c6b8efc2	Merge pull request #120 from PikalaxALT/unk_text_util ... Decompile asm/unk_text_util.s	2017-11-27 18:39:50 -06:00
Diegoisawesome	db87e2db4c	Merge pull request #117 from ProjectRevoTPP/load_save ... finish load_save.c	2017-11-27 15:19:08 -06:00
DizzyEggg	b0657350a4	berry blender fix merge conflicts	2017-11-26 19:21:51 +01:00
PikalaxALT	a875d665b8	Merge branch 'master' into easy_chat	2017-11-25 10:56:55 -05:00
PikalaxALT	f9c3aeb919	sub_8135380	2017-11-24 22:30:20 -05:00
PikalaxALT	2746967bef	through sub_8134CE8	2017-11-24 20:46:29 -05:00
PikalaxALT	2280614a14	Start decompiling data	2017-11-24 19:06:01 -05:00
PikalaxALT	f54f2c424f	LoadWallClockGraphics	2017-11-24 18:00:26 -05:00
PikalaxALT	ab569cc466	clock.s	2017-11-24 14:57:00 -05:00