63 Commits

Author	SHA1	Message	Date
KDSKardabox	301664db2f	Matching the unmatched and another function	2018-02-15 17:12:02 +05:30
golem galvanize	e1bd37dca9	fix merge conflicts	2018-02-13 22:19:14 -05:00
golem galvanize	e5b6d15f91	move data to c	2018-02-13 22:12:02 -05:00
KDSKardabox	aaea65c37b	Merge branch 'master' of https://github.com/pret/pokeemerald ... # Conflicts: # include/strings.h	2018-02-13 10:02:27 +05:30
KDSKardabox	ae321d6e7c	move to strings.h	2018-02-13 09:32:40 +05:30
golem galvanize	4ac064bbaf	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu	2018-02-12 14:00:47 -05:00
golem galvanize	f81c52b56e	more fixes	2018-02-12 13:59:42 -05:00
PikalaxALT	ea347199a2	Merge branch 'master' into link	2018-02-11 19:22:06 -05:00
golem galvanize	601a942db4	decompile main_menu	2018-02-11 17:19:36 -05:00
golem galvanize	56e1a52823	Fixes	2018-02-08 21:00:28 -05:00
Diegoisawesome	772fd47564	Merge branch 'master' of https://github.com/pret/pokeemerald into menu	2018-02-07 18:06:59 -06:00
Diegoisawesome	802b505d7b	Merge pull request #199 from DizzyEggg/decompile_rtc_screen ... decompile rtc reset screen	2018-02-07 13:03:59 -06:00
Diegoisawesome	d396a8f89c	Merge new_menu_helpers and menu	2018-02-07 00:07:42 -06:00
PikalaxALT	d52f52fa73	Merge branch 'master' into link	2018-02-03 09:42:19 -05:00
DizzyEggg	27452ca822	decompile rtc reset screen	2018-02-02 19:00:01 +01:00
DizzyEggg	14d2caaf8d	start decompiling berry tag screen	2018-02-02 12:32:12 +01:00
DizzyEggg	741b8adf9a	decompile mystery event menu	2018-01-30 23:23:35 +01:00
Diegoisawesome	5a57485ece	Decompile naming_screen.c	2018-01-23 21:30:13 -06:00
PikalaxALT	d4e8c20f84	Merge branch 'master' into link	2018-01-21 23:20:13 -05:00
DizzyEggg	f53a39e7a2	mystery event labels	2018-01-21 19:30:01 +01:00
DizzyEggg	0bc7fb92db	start decompiling mystery event script	2018-01-21 12:36:11 +01:00
scnorton	c6ff1a6ce3	Merge branch 'master' into link	2018-01-18 12:53:31 -05:00
DizzyEggg	4dd06dbcd3	optiom menu move data to C	2018-01-16 19:39:35 +01:00
DizzyEggg	a6072ae293	decompile option menu	2018-01-16 18:59:06 +01:00
DizzyEggg	e647cb2308	dump start menu and a bit of textwindow and trainercard	2017-12-23 19:23:55 +01:00
DizzyEggg	3ca5af4d5d	do some pointer storage system hunting	2017-12-22 20:10:51 +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	7517f6a030	fix battle setup conflicts	2017-12-17 20:26:13 +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	5b409d49ed	pokeblock.s is decompiled	2017-12-16 15:10:29 +01:00
PikalaxALT	da2e0dfe50	Merge branch 'master' into clock	2017-12-15 21:04:25 -05:00
DizzyEggg	4351676749	decompile more of pokeblock.s	2017-12-16 00:08:23 +01:00
DizzyEggg	8ac17e0948	move data from asm to pokeblock.c	2017-12-11 16:52:28 +01:00
DizzyEggg	6561b62986	start pokeblock feed	2017-12-09 21:23:40 +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
PikalaxALT	b210d5f86b	through c3_80BF560	2017-11-24 21:06:46 -05:00
PikalaxALT	efd23cb91b	Cb2_ViewWallClock	2017-11-24 20:06:29 -05:00
PikalaxALT	24009ea941	through Cb2_StartWallClock and associated data	2017-11-24 19:49:03 -05:00
PikalaxALT	da04898840	Clean up includes	2017-11-23 23:10:51 -05:00
PikalaxALT	eff1ad3300	Decompile field poison	2017-11-22 20:13:15 -05:00
PikalaxALT	236cbf96c8	Merge origin/master into pikalaxalt/link	2017-11-16 19:00:07 -05:00
PikalaxALT	f21c5ebea5	through sub_800B1A0	2017-11-12 23:58:05 -05:00
PikalaxALT	85cf626316	sub_800B080	2017-11-12 23:33:03 -05:00
PikalaxALT	1ca032c6ff	Address review items, 1	2017-11-12 21:13:18 -05:00