1224 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
DizzyEggg	185402fe21	more work on berry blender	2017-11-18 21:38:57 +01:00
DizzyEggg	8fd3081306	start working on berry blender	2017-11-18 16:11:34 +01:00
Diegoisawesome	3883c39991	Merge pull request #114 from DizzyEggg/decompile_daycare ... Decompile daycare	2017-11-17 14:25:45 -06:00
DizzyEggg	1b7246395d	merge conflicts, review changes, daycare	2017-11-17 19:31:03 +01:00
Diegoisawesome	a98c6bf210	Fix build by renaming specials	2017-11-16 09:30:04 -06:00
Diegoisawesome	c0d180a870	Merge pull request #100 from PikalaxALT/heal_location ... Heal location and Field Region Map	2017-11-15 23:24:45 -06:00
PikalaxALT	b46a15b03e	Enclose flag macro definitions in parentheses	2017-11-16 00:13:06 -05:00
PikalaxALT	a7f72e7da1	Remove spaces between incrementor and incrementee	2017-11-16 00:01:47 -05:00
Diegoisawesome	6a73c89e54	Merge pull request #113 from DizzyEggg/decompile_pss ... Start Pokemon Storage System	2017-11-15 20:55:38 -06:00
DizzyEggg	ba00a1c688	daycare file fully done	2017-11-15 22:12:18 +01:00
DizzyEggg	616edd6c3f	daycare file is decompiled	2017-11-15 20:08:31 +01:00
DizzyEggg	1e79d53d2f	merge daycare with master	2017-11-15 17:18:05 +01:00
PikalaxALT	89b695278d	Merge branch 'master' into heal_location	2017-11-15 09:01:56 -05:00
Diegoisawesome	055a419830	Merge pull request #101 from Diegoisawesome/dump_maps ... Dump maps	2017-11-15 01:01:06 -06:00
Diegoisawesome	ce0e5cbfe4	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps	2017-11-15 00:47:34 -06:00
Diegoisawesome	3fb2a488f9	Merge pull request #111 from DizzyEggg/decompile_battle5 ... Decompile battle5	2017-11-14 16:52:40 -06:00
Diegoisawesome	118bf4f4b1	Merge pull request #108 from DizzyEggg/decompile_starter_choose ... Decompile starter choose	2017-11-14 16:41:53 -06:00
DizzyEggg	6e2b1d4315	starter choose sym bss space to align	2017-11-14 23:27:22 +01:00
DizzyEggg	0310be3007	more of daycare done	2017-11-14 23:25:07 +01:00
DizzyEggg	95949c772e	more of daycare done	2017-11-14 21:43:23 +01:00
DizzyEggg	a972de7bca	start working on daycare	2017-11-14 20:23:25 +01:00
Diegoisawesome	72b57b342e	Merge pull request #106 from DizzyEggg/decompile_hall_of_fame ... Decompile hall of fame	2017-11-13 15:33:48 -06:00
DizzyEggg	048dc4aa28	fix graphics rules file	2017-11-13 22:10:25 +01:00
DizzyEggg	8a56532d35	fix graphics rules file	2017-11-13 22:08:50 +01:00
DizzyEggg	5c44c64050	add hof graphics	2017-11-13 21:55:38 +01:00
DizzyEggg	516a5b2219	fix merge conflicts, review changes	2017-11-13 20:00:20 +01:00
Diegoisawesome	d1fe93bf4a	Merge pull request #105 from DizzyEggg/dump_things ... Get rid of a couple of baseroms	2017-11-13 12:46:40 -06:00
DizzyEggg	ea575ee217	fix typo in a string	2017-11-13 19:42:03 +01:00
DizzyEggg	4d615350c8	added berry blender start gfx	2017-11-13 19:36:23 +01:00
DizzyEggg	bb9c928330	starter choose review changes	2017-11-13 18:30:17 +01:00
DizzyEggg	ac68187895	review changes adding a pal file	2017-11-13 18:18:12 +01:00
PikalaxALT	79609d52c8	MAPSEC_DYNAMIC	2017-11-12 21:39:44 -05:00
PikalaxALT	1ca032c6ff	Address review items, 1	2017-11-12 21:13:18 -05:00
DizzyEggg	8ceea171b3	leave out pss for now	2017-11-13 00:15:07 +01:00
DizzyEggg	c967ba1d5f	dump couple of baseroms review changes	2017-11-12 18:41:04 +01:00
DizzyEggg	716590c165	one more battle label change	2017-11-12 17:11:06 +01:00
DizzyEggg	9febe24d9f	label some battle struct fields	2017-11-12 17:06:31 +01:00
DizzyEggg	cd879d6f8a	Merge branch 'battle4_fixes' into decompile_battle5	2017-11-12 16:46:44 +01:00
DizzyEggg	47a8c6c432	battle5 decompiled and renamed	2017-11-12 16:39:21 +01:00
Diegoisawesome	6e6e11205d	Fix capitalized symbol names	2017-11-11 18:17:46 -06:00
DizzyEggg	b7fa10d01e	Merge branch 'master' into battle4_fixes	2017-11-12 00:17:38 +01:00
DizzyEggg	c3f6f528e8	come closer maybe	2017-11-12 00:16:46 +01:00
Diegoisawesome	f497c1508b	Split files from event_scripts.s ... Also move maps/scripts to scripts/maps	2017-11-11 16:10:17 -06:00
DizzyEggg	b1abe40230	atk9e_metronome matching	2017-11-11 22:58:23 +01:00
Cameron Hall	558bf2f7d0	Merge pull request #104 from DizzyEggg/decompile_battle_7 ... Decompile battle 7	2017-11-11 15:48:17 -06:00
PikalaxALT	567b2af081	Drop tracking on gbapal files	2017-11-11 14:38:53 -05:00
DizzyEggg	7472d639cf	match one function in battlescript cmds	2017-11-11 20:01:04 +01:00
DizzyEggg	fa3691ca40	start pss	2017-11-11 14:45:08 +01:00
Diegoisawesome	2e40384fa2	Extract baseroms from event_scripts	2017-11-10 18:12:18 -06:00
Diegoisawesome	a6c30ba951	More file organization	2017-11-10 13:20:27 -06:00