1466 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
itskobold	a9f7a41edd	battle_frontier_1 buncha pointers fixed	2017-11-22 13:05:28 +00:00
ProjectRevoTPP	adba0bacfc	Merge branch 'master' of https://github.com/pret/pokeemerald into load_save	2017-11-21 21:25:48 -05:00
ProjectRevoTPP	161a37809b	nonmatching MoveSaveBlocks_ResetHeap (i tried...)	2017-11-21 21:25:01 -05:00
itskobold	caf952e02e	Merge branch 'master' of https://github.com/pret/pokeemerald	2017-11-20 18:27:23 +00:00
Diegoisawesome	1e4f12e6fa	Merge pull request #115 from DizzyEggg/decompile_wild_encounter ... Decompile wild encounter	2017-11-20 10:10:27 -06:00
DizzyEggg	4e25ef10f2	wild encounter review changes	2017-11-20 16:40:02 +01:00
DizzyEggg	ad3a97e178	berry blender merge conflicts	2017-11-19 22:58:13 +01:00
DizzyEggg	a3b5af17ea	berry blender is done	2017-11-19 22:48:46 +01:00
itskobold	625be4bf04	Merge branch 'master' of https://github.com/pret/pokeemerald	2017-11-19 10:50:39 +00:00
DizzyEggg	3de416662b	wild encounter, fix merge conflicts	2017-11-18 21:45:52 +01:00
DizzyEggg	185402fe21	more work on berry blender	2017-11-18 21:38:57 +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	8fd3081306	start working on berry blender	2017-11-18 16:11:34 +01:00
DizzyEggg	f8b40754c7	wild encounter done	2017-11-18 12:27:10 +01:00
DizzyEggg	ca43536242	make recorded battle compile	2017-11-17 22:33:36 +01:00
DizzyEggg	6b075ae0ff	wild encounter file is decompiled	2017-11-17 22:28:55 +01:00
Diegoisawesome	52624c4fb7	Merge branch 'master' of https://github.com/pret/pokeemerald	2017-11-17 15:07:17 -06:00
Diegoisawesome	3883c39991	Merge pull request #114 from DizzyEggg/decompile_daycare ... Decompile daycare	2017-11-17 14:25:45 -06:00
DizzyEggg	d0245cf8d2	recorded battle merge conflicts fix	2017-11-17 19:34:55 +01:00
DizzyEggg	1b7246395d	merge conflicts, review changes, daycare	2017-11-17 19:31:03 +01:00
DizzyEggg	a2a17bba92	more work on wild encounter	2017-11-17 17:50:07 +01:00
itskobold	370e47beee	Merge branch 'master' of https://github.com/pret/pokeemerald	2017-11-17 09:25:40 +00:00
DizzyEggg	b37d8c0821	start decompiling wild encounter	2017-11-16 20:38:10 +01:00
Diegoisawesome	a98c6bf210	Fix build by renaming specials	2017-11-16 09:30:04 -06:00
Diegoisawesome	f8402b3d74	Rename contest string symbols	2017-11-15 23:57:38 -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
itskobold	46ee15b962	Getting myself organised ... durr	2017-11-15 12:55:16 +00:00
itskobold	7c79b030e9	Merge branch 'master' of https://github.com/pret/pokeemerald	2017-11-15 12:42:18 +00:00
itskobold	2acab81713	Merge branch 'master' of https://github.com/pret/pokeemerald ... also started fixing pointers in my dumps	2017-11-15 12:41:25 +00: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