1079 Commits

Author	SHA1	Message	Date
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	54dccc8512	give batter script command names	2017-12-17 20:38:01 +01:00
DizzyEggg	7517f6a030	fix battle setup conflicts	2017-12-17 20:26:13 +01:00
DizzyEggg	46fa2557d7	merge mail with master, fix conflicts	2017-12-17 20:22:56 +01:00
DizzyEggg	eb8055eb07	battle 1 is decompiled	2017-12-17 20:10:57 +01:00
PikalaxALT	6d73bb4b57	Import function labels from Ruby	2017-12-16 10:23:05 -05:00
DizzyEggg	c3abe2863f	rename	2017-12-16 15:12:55 +01:00
DizzyEggg	5b409d49ed	pokeblock.s is decompiled	2017-12-16 15:10:29 +01:00
DizzyEggg	f4ab21ee67	Merge branch 'master' into decompile_use_pokeblock	2017-12-16 11:42:59 +01:00
PikalaxALT	da2e0dfe50	Merge branch 'master' into clock	2017-12-15 21:04:25 -05: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	c681b482c2	convert more constants	2017-12-11 12:27:51 -06:00
DizzyEggg	8ac17e0948	move data from asm to pokeblock.c	2017-12-11 16:52:28 +01:00
DizzyEggg	b4d10ab7ab	split pokeblock files	2017-12-10 19:02:51 +01:00
DizzyEggg	fb30acbc30	pokeblock feed is decompiled	2017-12-10 15:04:03 +01:00
DizzyEggg	bb1ae5f857	Merge branch 'master' into decompile_use_pokeblock	2017-12-09 21:24:47 +01:00
DizzyEggg	6561b62986	start pokeblock feed	2017-12-09 21:23:40 +01:00
camthesaxman	00896cb3b5	rename rng.c to random.c and rom4.c to overworld.c	2017-12-05 12:27:33 -06:00
Cameron Hall	fd75493bc6	Merge pull request #129 from DizzyEggg/dumb_naming ... Name some battle labels	2017-12-05 12:05:06 -06:00
DizzyEggg	ad07843f2d	start working on use pokeblock	2017-12-04 23:09:44 +01:00
EternalCode	077089f0e5	fldeff_teleport file completed	2017-12-03 20:46:56 -05:00
DizzyEggg	4faa442d5a	decompile and label mail	2017-12-03 19:19:11 +01:00
DizzyEggg	2fe25da65a	move pokeball data to rom	2017-12-02 21:27:00 +01:00
DizzyEggg	c2fdde3a49	pokeball file is decompiled	2017-12-02 20:38:26 +01:00
DizzyEggg	c27f7a8131	start working on pokeball	2017-12-02 19:39:07 +01:00
DizzyEggg	d75e7ace1d	label battle stuff	2017-12-02 14:08:55 +01:00
DizzyEggg	273474d57a	give names to some battlescripts	2017-12-02 00:03:46 +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
DizzyEggg	e8ecb01ab2	more work on battle setup	2017-11-29 19:54:15 +01:00
PikalaxALT	10068b0345	Merge branch 'master' into field_poison	2017-11-29 08:19:54 -05:00
Diegoisawesome	70743f4b95	Merge branch 'master' of https://github.com/pret/pokeemerald	2017-11-29 00:52:32 -06:00
DizzyEggg	10470ef536	start working on battle setup	2017-11-28 23:02:09 +01:00
Diegoisawesome	54da963091	Merge pull request #122 from PikalaxALT/unk_81BAD84 ... Unk 81 bad84	2017-11-28 10:11:49 -06:00
PikalaxALT	88636dfc2a	Merge branch 'master' into clock	2017-11-27 20:09:53 -05:00
PikalaxALT	b9d08ed83b	Merge branch 'master' into unk_81BAD84	2017-11-27 20:08:34 -05:00
PikalaxALT	1ac177723d	Merge branch 'master' into field_poison	2017-11-27 20:07:33 -05:00
PikalaxALT	41eb2ed59e	Merge branch 'master' into coins	2017-11-27 20:06:38 -05:00
Diegoisawesome	18c6b8efc2	Merge pull request #120 from PikalaxALT/unk_text_util ... Decompile asm/unk_text_util.s	2017-11-27 18:39:50 -06:00
Diegoisawesome	db87e2db4c	Merge pull request #117 from ProjectRevoTPP/load_save ... finish load_save.c	2017-11-27 15:19:08 -06:00
ProjectRevoTPP	e6bcfee668	Encyprtion	2017-11-27 15:20:10 -05:00
Cameron Hall	6e317c6463	Merge pull request #124 from DizzyEggg/dump_battlescripts ... Dump Battle Scripts	2017-11-27 14:00:29 -06:00
DizzyEggg	237261e193	berry blender review changes	2017-11-27 20:03:41 +01:00
DizzyEggg	77a6c30bd4	make various macros	2017-11-26 21:04:00 +01:00
DizzyEggg	b0657350a4	berry blender fix merge conflicts	2017-11-26 19:21:51 +01:00
DizzyEggg	9886eeb5d8	fix, rename, label battle labels and battlescripts	2017-11-26 13:26:58 +01:00
DizzyEggg	cc572f7c00	clear battle code and battlescripts	2017-11-26 11:55:17 +01:00
DizzyEggg	938d346b6d	fixes and labels	2017-11-26 01:19:57 +01:00
DizzyEggg	847bfa1540	add more battlescript macros	2017-11-25 21:32:17 +01:00
DizzyEggg	fe658cc2fd	create setword macro	2017-11-25 21:11:20 +01:00
DizzyEggg	9151a6d094	dump battlescripts, rename battlescripts	2017-11-25 18:42:31 +01:00
PikalaxALT	f9c3aeb919	sub_8135380	2017-11-24 22:30:20 -05:00
PikalaxALT	1063bcaab8	through sub_81352DC	2017-11-24 22:28:13 -05:00
PikalaxALT	53a7f188f8	through sub_81351AC	2017-11-24 22:08:12 -05:00
PikalaxALT	23c7c6a41c	_12HourClockFixAMPM	2017-11-24 21:52:22 -05:00
PikalaxALT	1b3fcb83f2	sub_813504C	2017-11-24 21:37:42 -05:00
PikalaxALT	dfa5f24e59	sub_8134FFC	2017-11-24 21:27:05 -05:00
PikalaxALT	046e5ebf69	through sub_8134FB0	2017-11-24 21:17:50 -05:00
PikalaxALT	4a81b595c3	through c2_080111BC	2017-11-24 21:11:32 -05:00
PikalaxALT	b210d5f86b	through c3_80BF560	2017-11-24 21:06:46 -05:00
PikalaxALT	2746967bef	through sub_8134CE8	2017-11-24 20:46:29 -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	f54f2c424f	LoadWallClockGraphics	2017-11-24 18:00:26 -05:00
PikalaxALT	ab569cc466	clock.s	2017-11-24 14:57:00 -05:00
PikalaxALT	c5dcbb78ce	unk_81BAD84	2017-11-23 21:04:15 -05:00
PikalaxALT	89d938ea9e	Finish decompiling coins	2017-11-23 13:53:51 -05:00
PikalaxALT	ef18d3b8ec	Decompile asm/unk_text_util.s	2017-11-23 11:23:05 -05:00
ProjectRevoTPP	9644f44982	finish load_save.c	2017-11-22 21:06:30 -05:00
PikalaxALT	eff1ad3300	Decompile field poison	2017-11-22 20:13:15 -05: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
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	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
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	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
Diegoisawesome	6a73c89e54	Merge pull request #113 from DizzyEggg/decompile_pss ... Start Pokemon Storage System	2017-11-15 20:55:38 -06: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	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	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	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
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	3e1f3d0e1e	recorded battle file is decompiled	2017-11-13 19:01:23 +01:00
DizzyEggg	209b6eb467	more of recorded battle done	2017-11-13 18:07:23 +01:00
DizzyEggg	8ceea171b3	leave out pss for now	2017-11-13 00:15:07 +01:00
DizzyEggg	3b43668286	more recorded battle done	2017-11-13 00:10:34 +01:00
DizzyEggg	c4674735d2	start working on recorded battle	2017-11-12 22:59:36 +01:00
DizzyEggg	c967ba1d5f	dump couple of baseroms review changes	2017-11-12 18:41:04 +01:00
DizzyEggg	9febe24d9f	label some battle struct fields	2017-11-12 17:06:31 +01:00
DizzyEggg	47a8c6c432	battle5 decompiled and renamed	2017-11-12 16:39:21 +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	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
Diegoisawesome	6ecad1a59d	Organize map data	2017-11-10 12:39:00 -06:00
Diegoisawesome	a81deec3b3	Extract unused maps	2017-11-10 11:42:04 -06:00
Diegoisawesome	de8a058714	Extract more baseroms from maps	2017-11-10 02:52:05 -06:00
Diegoisawesome	29079c4b99	Dump numerous baseroms, begin moving data to proper files	2017-11-10 01:49:12 -06:00
Diegoisawesome	09e431077a	Merge remote-tracking branch 'pret/master' into dump_maps	2017-11-09 20:30:56 -06:00
Diegoisawesome	2d3044aaa6	Begin map dump cleanup	2017-11-09 19:38:57 -06:00
Diegoisawesome	e6ef86e4b0	Update variable and flag names	2017-11-08 15:20:10 -06:00
DizzyEggg	61408456e8	starter choose file is decompiled	2017-11-08 18:05:47 +01:00
itskobold	860d5e026d	Labelling fix ... Oversight	2017-11-07 22:11:48 +00:00
DizzyEggg	19d9cff2ff	static variables to hall of fame c	2017-11-06 18:57:22 +01:00
DizzyEggg	a729e9838e	move data to hall of fame c file	2017-11-06 18:41:32 +01:00
DizzyEggg	a2263207bf	hall of fame is decompiled	2017-11-06 17:27:39 +01:00
DizzyEggg	0f723f7677	halfway through hall of fame	2017-11-05 14:55:13 +01:00
DizzyEggg	bd56bb073f	start working on hall of fame	2017-11-05 12:05:07 +01:00
DizzyEggg	135c4ea1f6	dump some of the item menu	2017-11-05 00:16:09 +01:00
DizzyEggg	4d4d642285	dump berry blender and script menu	2017-11-04 22:40:36 +01:00
DizzyEggg	352102a07a	Merge branch 'master' into decompile_battle_7	2017-11-04 16:12:45 +01:00
DizzyEggg	6c8155074b	battle 7 is decompiled	2017-11-04 16:11:13 +01:00
DizzyEggg	5243285ab2	start working on battle 7	2017-11-02 18:19:49 +01:00
PikalaxALT	ab3b8cd51a	Merge branch 'master' into heal_location	2017-11-02 07:59:29 -04:00
Diegoisawesome	af197ccd3b	Merge pull request #98 from PikalaxALT/bard_music ... Decompile bard music	2017-11-01 23:18:10 -05:00
PikalaxALT	75262c1920	Merge branch 'master' into bard_music	2017-11-02 00:09:14 -04:00
PikalaxALT	6543d7f2d6	Merge branch 'master' into heal_location	2017-11-01 23:43:08 -04:00
PikalaxALT	8a4f0287da	Merge branch 'master' into secret_base	2017-11-01 23:42:04 -04:00
Diegoisawesome	c71f6baa8c	Merge pull request #99 from PikalaxALT/math_util ... Meme Util	2017-11-01 22:41:28 -05:00
PikalaxALT	17fd3bccf7	Merge branch 'master' into secret_base	2017-11-01 23:39:54 -04:00
PikalaxALT	9cfdc8b7e8	Merge branch 'master' into heal_location	2017-11-01 23:37:41 -04:00
PikalaxALT	e3005e88c7	Decompile remaining functions in region_map	2017-11-01 00:34:57 -04:00
PikalaxALT	ee60ae7da9	sub_8124BE4	2017-11-01 00:01:17 -04:00
PikalaxALT	9f5f134476	sub_8124AD4	2017-10-31 23:39:09 -04:00
PikalaxALT	3d2571b0c5	sub_8124A70	2017-10-31 23:18:56 -04:00
PikalaxALT	8c73c1450f	sub_8124904	2017-10-31 23:11:48 -04:00
PikalaxALT	01c4b3bd35	through sub_81248F4	2017-10-31 22:37:28 -04:00
PikalaxALT	f61822535b	MCB2_FlyMap	2017-10-31 22:34:12 -04:00
PikalaxALT	f6d1e5a965	through sub_8124668	2017-10-31 22:05:23 -04:00
PikalaxALT	c3c08bf037	through sub_8124610	2017-10-31 21:55:57 -04:00
PikalaxALT	ef535b98b5	through GetMapName	2017-10-31 21:51:11 -04:00
PikalaxALT	2f1325416b	through RegionMapPlayerIconSpriteCallback	2017-10-31 21:32:25 -04:00
PikalaxALT	968ff8c3c8	through UnhideRegionMapPlayerIcon	2017-10-31 20:58:47 -04:00
PikalaxALT	7d7c8e8ba6	sub_8124288	2017-10-31 19:40:35 -04:00
DizzyEggg	6cb1c4fd6e	fix merge conflicts, evo scene	2017-10-31 19:36:25 +01:00
DizzyEggg	712ae56167	review change battle controllers	2017-10-31 18:04:08 +01:00
PikalaxALT	9f03434a13	through sub_8124278	2017-10-31 08:44:03 -04:00
PikalaxALT	6cd0086bf9	through CreateRegionMapCursor	2017-10-31 08:38:17 -04:00
PikalaxALT	853ced6687	sub_8123FB0	2017-10-30 22:35:28 -04:00
PikalaxALT	4db83e0097	through sub_8123F9C	2017-10-30 22:20:09 -04:00
PikalaxALT	ccbeaccc9b	sub_8123F30	2017-10-30 21:47:37 -04:00
PikalaxALT	7b6792230a	sub_8123EB4	2017-10-30 21:34:19 -04:00
PikalaxALT	f0c71c7e3f	get_flagnr_blue_points	2017-10-30 21:20:31 -04:00
PikalaxALT	cd9022f929	sub_8123C00	2017-10-30 21:14:52 -04:00
PikalaxALT	525b17a110	sub_81238AC	2017-10-30 21:08:28 -04:00
PikalaxALT	c324722987	through GetRegionMapSectionIdAt	2017-10-30 08:58:43 -04:00
PikalaxALT	f6a55433a2	through sub_81237B4	2017-10-30 08:46:36 -04:00
PikalaxALT	474df27136	through CalcZoomScrollParams	2017-10-30 08:39:39 -04:00
PikalaxALT	35a6d2046a	sub_8123418	2017-10-29 23:08:06 -04:00
PikalaxALT	1597284694	sub_8123334	2017-10-29 22:05:15 -04:00
PikalaxALT	16c5a58f35	sub_8123254	2017-10-29 21:38:45 -04:00
PikalaxALT	8d35bf1c9e	_swiopen	2017-10-29 21:31:38 -04:00
PikalaxALT	f07307dc73	sub_81230C4	2017-10-29 21:14:53 -04:00
PikalaxALT	a9afb8b130	through sub_81230AC	2017-10-29 20:58:53 -04:00
PikalaxALT	6f68e5af95	sub_8122DB0	2017-10-29 20:49:49 -04:00
PikalaxALT	76bb397e83	region_map.c through sub_8122CF8	2017-10-29 19:33:53 -04:00
DizzyEggg	51df918c04	evo scene file is done	2017-10-29 16:15:23 +01:00
PikalaxALT	c0a229f108	Decompile field region map bg and window templates	2017-10-29 11:12:28 -04:00
PikalaxALT	6e10e8caad	sub_8170428	2017-10-29 11:05:42 -04:00
PikalaxALT	929638f572	sub_8170290	2017-10-29 10:58:33 -04:00
PikalaxALT	0a060ae254	Start decompiling field_region_map	2017-10-29 10:38:25 -04:00
PikalaxALT	bbda7125f6	Rename functions	2017-10-28 21:43:06 -04:00
PikalaxALT	00f4bba6d8	Decompile heal location functions	2017-10-28 20:55:01 -04:00
PikalaxALT	6d3778948d	finish math_util	2017-10-28 16:15:36 -04:00
PikalaxALT	8613e8a54d	through sub_81515FC	2017-10-28 16:09:31 -04:00
PikalaxALT	f57776c74c	through sub_8151574	2017-10-28 15:58:07 -04:00
PikalaxALT	5da296e94e	GetWordPhonemes; assign names and improve guess of types	2017-10-28 09:46:35 -04:00
PikalaxALT	002b394855	through sub_817C7F4	2017-10-28 09:05:40 -04:00
PikalaxALT	4c274f6030	Last remaining function in secret base	2017-10-27 22:46:57 -04:00
PikalaxALT	f601525474	sub_80EBB28	2017-10-27 22:43:11 -04:00
PikalaxALT	9a5320135b	sub_80EB9E0	2017-10-27 22:38:33 -04:00
PikalaxALT	939d728405	sub_80EB56C	2017-10-27 22:34:38 -04:00
PikalaxALT	69d206c255	sub_80EB498	2017-10-27 22:24:54 -04:00
PikalaxALT	b8b2a7ca40	through sub_80EB438	2017-10-27 22:20:13 -04:00