854 Commits

Author	SHA1	Message	Date
DizzyEggg	a28dfd6da4	Merge branch 'master' into clear_battle_files	2018-02-28 23:58:29 +01:00
Diegoisawesome	bcef4e7d1c	Merge pull request #221 from DizzyEggg/data_to_c ... Move some data to C	2018-02-28 16:55:45 -06:00
DizzyEggg	e93da9b1f9	make strings in battle message static	2018-02-28 23:50:25 +01:00
Diegoisawesome	a57e04e14d	Merge pull request #220 from PikalaxALT/trainer_rematch ... Decompile trainer_rematch	2018-02-28 16:41:54 -06:00
Diegoisawesome	0cd9ba36ce	Merge pull request #224 from DizzyEggg/another_try ... Fix two nonmatching functions	2018-02-28 13:05:05 -06:00
DizzyEggg	305a4fa744	match two functions	2018-02-28 19:37:48 +01:00
DizzyEggg	85a959f321	clean up files	2018-02-28 13:07:58 +01:00
DizzyEggg	2fa00d01ee	make it compile	2018-02-26 15:56:59 +01:00
PikalaxALT	1616f998fc	Rename some flags relevant to the conditions under which Wattson becomes available for rematch	2018-02-26 08:42:15 -05:00
DizzyEggg	1972303792	type and ability names to C	2018-02-26 14:29:17 +01:00
PikalaxALT	f46e941f30	Name functions, variables, and that one flag constant	2018-02-26 08:23:17 -05:00
DizzyEggg	919f803214	correct move target defines	2018-02-26 13:24:46 +01:00
DizzyEggg	8821d6396a	move battle moves to C	2018-02-26 12:59:52 +01:00
PikalaxALT	80906f022b	Cleanup; create enums for trainer rematches	2018-02-25 22:33:58 -05:00
Diegoisawesome	ebd88b3606	Merge branch 'master' of https://github.com/pret/pokeemerald into intro	2018-02-17 04:03:59 -06:00
Diegoisawesome	1605f62535	Decompile credits	2018-02-17 04:00:22 -06:00
Diegoisawesome	bc4bb5b32e	Start intro_credits_graphics decomp	2018-02-16 13:08:21 -06:00
Diegoisawesome	0a206ee52c	Finish decompiling intro	2018-02-15 22:30:39 -06:00
KDSKardabox	ffeca135bc	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-02-16 09:29:11 +05:30
Diegoisawesome	34716558b1	Almost finish decompiling intro	2018-02-15 16:54:34 -06:00
DizzyEggg	824699f505	overworld review changes2	2018-02-15 23:09:52 +01:00
KDSKardabox	a200d9406b	Finish fldeff_softboiled.c	2018-02-15 22:32:28 +05:30
KDSKardabox	301664db2f	Matching the unmatched and another function	2018-02-15 17:12:02 +05:30
DizzyEggg	90fa97f810	merge overworld with master	2018-02-15 12:41:32 +01:00
DizzyEggg	4b4495f3fe	overworld review changes	2018-02-15 12:36:52 +01:00
KDSKardabox	64683e1473	[WIP] Decompile fledd_softboiled.h	2018-02-15 15:29:26 +05:30
KDSKardabox	2fb78b5ca8	Fix reviewed points.	2018-02-15 09:47:42 +05:30
KDSKardabox	895c72cb26	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-02-15 09:45:15 +05:30
golem galvanize	c3c30417ef	fixes	2018-02-14 20:45:27 -05:00
KDSKardabox	deeaac2bf1	Decompile fldeff_sweetsecent.c	2018-02-14 17:24:31 +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
DizzyEggg	5dde701c81	merge overworld with master	2018-02-14 01:12:17 +01:00
DizzyEggg	94b47c0686	decompile overworld	2018-02-14 00:58:22 +01:00
KDSKardabox	c959dc1174	Finish fldeff_strength.s	2018-02-13 23:08:54 +05:30
KDSKardabox	e375606810	[Do not Merge] fldeff_strength.s	2018-02-13 21:52:33 +05:30
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
KDSKardabox	7b360b2e33	Review fixes	2018-02-13 09:16:38 +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
DizzyEggg	f22be4d010	more overworld work	2018-02-12 18:26:26 +01:00
DizzyEggg	382442c4c8	start decompiling overworld.s	2018-02-12 15:01:43 +01:00
KDSKardabox	54922641af	Port smokescreen.s	2018-02-12 16:44:04 +05:30
KDSKardabox	185cf71842	Missing label	2018-02-12 16:17:57 +05:30
KDSKardabox	d52a54e64f	Updating pokedex count function labels	2018-02-12 16:15:51 +05:30
Diegoisawesome	a4787bc06a	Merge pull request #207 from DizzyEggg/decompile_pokemon_123 ... Decompile and clean pokemon files	2018-02-11 22:13:15 -06:00
golem galvanize	f2144e9932	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu	2018-02-11 20:34:56 -05:00
PikalaxALT	ea347199a2	Merge branch 'master' into link	2018-02-11 19:22:06 -05:00
DizzyEggg	5e781f5b3f	change some constants to male and female	2018-02-12 00:11:10 +01:00