115 Commits

Author	SHA1	Message	Date
DizzyEggg	03b593d3c3	try my luck with record mixing	2018-05-22 21:54:57 +02:00
DizzyEggg	1a8d5132d6	fix record mixing for real	2018-05-20 10:51:09 +02:00
DizzyEggg	e44f35c7b7	fix record mixing merge conflicts	2018-05-19 12:32:44 +02:00
Diegoisawesome	23b050a99e	Update naked attribute and ASM_DIRECT to NAKED macro	2018-05-11 17:24:32 -05:00
PikalaxALT	fd1d75ce37	Merge branch 'master' into mauville_old_man	2018-05-07 18:18:00 -04:00
PikalaxALT	61cc1d5574	Rename symbols using Ruby as a reference	2018-05-07 18:11:20 -04:00
PikalaxALT	58200616d5	Merge branch 'master' into trader	2018-05-04 17:45:50 -04:00
PikalaxALT	c6115a2fec	through sub_8120C0C	2018-05-03 17:03:52 -04:00
Marcus Huderle	cdb5e9e314	Merge pull request #242 from DizzyEggg/decompile_battle_records ... Decompile battle records	2018-05-03 08:42:44 -07:00
PikalaxALT	21c3e7e8e5	through SetMauvilleOldMan	2018-05-02 11:31:58 -04:00
PikalaxALT	4acbcf5759	Port trader from Ruby	2018-05-01 15:19:24 -04:00
DizzyEggg	95cf853762	battle records more decomp and subtle name changes	2018-05-01 14:01:54 +02:00
DizzyEggg	25c669e36b	decompile item	2018-04-29 13:36:26 +02:00
Diegoisawesome	ebd88b3606	Merge branch 'master' of https://github.com/pret/pokeemerald into intro	2018-02-17 04:03:59 -06:00
Diegoisawesome	0a206ee52c	Finish decompiling intro	2018-02-15 22:30:39 -06:00
DizzyEggg	94b47c0686	decompile overworld	2018-02-14 00:58:22 +01: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
PikalaxALT	590c4b500b	Merge branch 'master' into record_mixing	2018-02-11 20:12:40 -05:00
PikalaxALT	ea347199a2	Merge branch 'master' into link	2018-02-11 19:22:06 -05:00
Diegoisawesome	772fd47564	Merge branch 'master' of https://github.com/pret/pokeemerald into menu	2018-02-07 18:06:59 -06:00
DizzyEggg	96ab6f8353	match secret base func and fix struct	2018-02-07 13:49:33 +01:00
PikalaxALT	d52f52fa73	Merge branch 'master' into link	2018-02-03 09:42:19 -05:00
ProjectRevoTPP	78bd2b0849	move save rodata to source and use saveblock chunk macros	2018-01-31 15:26:57 -05:00
Diegoisawesome	3793152bc3	More work on menu	2018-01-29 17:26:36 -06:00
PikalaxALT	d4e8c20f84	Merge branch 'master' into link	2018-01-21 23:20:13 -05:00
PikalaxALT	d35cf06854	nonmatching sub_801120C	2018-01-21 18:25:23 -05:00
scnorton	89bbecd34b	Include <string.h> in global.h	2018-01-21 14:40:19 -05:00
scnorton	c6ff1a6ce3	Merge branch 'master' into link	2018-01-18 12:53:31 -05:00
ProjectRevoTPP	10ddfac7ab	consistency	2018-01-06 22:00:08 -05:00
ProjectRevoTPP	7be61cfb1a	add assert support to pokeemerald.	2018-01-06 21:12:42 -05:00
camthesaxman	601ec28721	remove explicit memcpy and add HEAP_SIZE constant	2018-01-06 00:35:48 -06: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	46fa2557d7	merge mail with master, fix conflicts	2017-12-17 20:22:56 +01:00
PikalaxALT	190a2cba61	Merge branch 'master' into link	2017-12-16 11:27:10 -05:00
DizzyEggg	f4ab21ee67	Merge branch 'master' into decompile_use_pokeblock	2017-12-16 11:42:59 +01: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
Diegoisawesome	e3c366df64	Merge remote-tracking branch 'pret/master'	2017-12-15 00:08:48 -06:00
camthesaxman	caa13f8777	convert some constants to C headers	2017-12-05 11:55:48 -06:00
PikalaxALT	0b58905eea	sub_800E3A8	2017-12-04 19:10:37 -05:00
DizzyEggg	4faa442d5a	decompile and label mail	2017-12-03 19:19:11 +01:00
DizzyEggg	e8ecb01ab2	more work on battle setup	2017-11-29 19:54:15 +01:00
Diegoisawesome	8e9428c482	Add languages to enum	2017-11-29 00:53:18 -06:00
PikalaxALT	cbd2718b5e	Merge branch 'master' into link	2017-11-27 20:05:51 -05:00
PikalaxALT	d6d315d817	Merge branch 'master' into link	2017-11-19 00:07:56 -05:00
DizzyEggg	3de416662b	wild encounter, fix merge conflicts	2017-11-18 21:45:52 +01:00
Diegoisawesome	5dc8beb034	Merge pull request #112 from DizzyEggg/decompile_recorded_battle ... Decompile recorded battle	2017-11-18 13:29:27 -06:00
DizzyEggg	6b075ae0ff	wild encounter file is decompiled	2017-11-17 22:28:55 +01:00