1124 Commits

Author	SHA1	Message	Date
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
PikalaxALT	b1c6f80e10	through sub_800F048	2017-12-10 10:31:11 -05:00
PikalaxALT	beeb86be37	through (nonmatching) sub_800EFB0	2017-12-10 10:23:43 -05: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
PikalaxALT	253b3c2fa5	sub_800EDD4	2017-12-08 08:24:54 -05:00
PikalaxALT	abc3869eca	through sub_800EDBC	2017-12-07 20:21:50 -05:00
PikalaxALT	6441ba7832	sub_800EB44	2017-12-07 20:04:07 -05:00
PikalaxALT	c9f43116aa	through sub_800EAFC	2017-12-07 08:48:49 -05:00
PikalaxALT	399d3731da	Reformat asm/librfu.s to clarify what is being accessed in pc-relative loads	2017-12-07 00:29:58 -05:00
PikalaxALT	94da6de903	sub_800E94C	2017-12-07 00:28:12 -05:00
PikalaxALT	4f342198c2	sub_800E88C	2017-12-06 23:55:40 -05:00
PikalaxALT	dc0d544119	sub_800E87C, remaining data in link_rfu	2017-12-05 23:54:31 -05: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
PikalaxALT	21619096da	sub_800E748	2017-12-04 21:05:41 -05:00
PikalaxALT	765ad80884	through sub_800E700	2017-12-04 20:06:03 -05:00
PikalaxALT	92fd61d6f2	through sub_800E604	2017-12-04 19:51:26 -05:00
PikalaxALT	0b58905eea	sub_800E3A8	2017-12-04 19:10:37 -05:00
DizzyEggg	ad07843f2d	start working on use pokeblock	2017-12-04 23:09:44 +01:00
PikalaxALT	feb0d13534	sub_800E174	2017-12-03 23:33:49 -05:00
PikalaxALT	3dd7ec7526	through sub_800E15C	2017-12-03 22:23:46 -05:00
PikalaxALT	8b5d6fe5d9	CreateWirelessStatusIndicatorSprite	2017-12-03 22:01:06 -05:00
EternalCode	077089f0e5	fldeff_teleport file completed	2017-12-03 20:46:56 -05:00
PikalaxALT	d5bc329de7	through sub_800DF90	2017-12-03 20:32:49 -05:00
PikalaxALT	519c8d42f8	through sub_800DD94	2017-12-03 20:04:54 -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
PikalaxALT	c282e4fa59	sub_800DBF8	2017-12-02 10:19:02 -05:00
DizzyEggg	d75e7ace1d	label battle stuff	2017-12-02 14:08:55 +01:00
PikalaxALT	e2244831a7	through sub_800DB18	2017-12-01 21:51:06 -05: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
PikalaxALT	b07ad8b169	through sub_800D9DC	2017-12-01 08:45:49 -05:00
PikalaxALT	a7e95b97ca	sub_800D7D8	2017-11-30 23:20:43 -05:00
PikalaxALT	cf539e253e	through sub_800D780	2017-11-30 22:56:56 -05:00
PikalaxALT	9f4ecadbfa	through sub_800D658	2017-11-30 22:05:07 -05:00
PikalaxALT	f974812e9b	through sub_800D5D0	2017-11-30 08:43:04 -05:00
PikalaxALT	f3ad97ad13	through sub_800D550	2017-11-30 08:35:33 -05:00
PikalaxALT	6f84853b08	sub_800D434	2017-11-30 08:26:39 -05:00
PikalaxALT	a781a6d5fd	through sub_800D358	2017-11-30 00:19:44 -05:00
PikalaxALT	c906978692	through sub_800D294; fix sub_800CF34	2017-11-29 23:58:48 -05:00
DizzyEggg	e8ecb01ab2	more work on battle setup	2017-11-29 19:54:15 +01:00
PikalaxALT	295e45c788	sub_800D158	2017-11-29 08:46:16 -05: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
PikalaxALT	3f00d341d5	nonmatching sub_800CF34	2017-11-28 19:41:32 -05: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
PikalaxALT	cbd2718b5e	Merge branch 'master' into link	2017-11-27 20:05:51 -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
PikalaxALT	73b0f9eb53	sub_800CEB0	2017-11-22 00:16:00 -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
PikalaxALT	7a38a43f81	sub_800C7B4	2017-11-21 09:14:43 -05:00
itskobold	caf952e02e	Merge branch 'master' of https://github.com/pret/pokeemerald	2017-11-20 18:27:23 +00:00
PikalaxALT	035c0b0ecd	sub_800C744	2017-11-19 18:34:28 -05:00
DizzyEggg	ad3a97e178	berry blender merge conflicts	2017-11-19 22:58:13 +01:00
PikalaxALT	cc82358864	sub_800C54C	2017-11-19 16:54:49 -05:00
DizzyEggg	a3b5af17ea	berry blender is done	2017-11-19 22:48:46 +01:00
PikalaxALT	03ce7b042a	sub_800C36C	2017-11-19 10:20:44 -05:00
itskobold	625be4bf04	Merge branch 'master' of https://github.com/pret/pokeemerald	2017-11-19 10:50:39 +00:00
PikalaxALT	d6d315d817	Merge branch 'master' into link	2017-11-19 00:07:56 -05:00
PikalaxALT	a5498843fa	Annotate possible file boundaries in link_rfu	2017-11-19 00:06:13 -05:00
PikalaxALT	22600e81cc	Start parsing out link_rfu common syms	2017-11-19 00:02:15 -05:00
PikalaxALT	bf06edfcd3	sub_800C27C	2017-11-18 23:30:23 -05:00
PikalaxALT	155bb03f46	sub_800C210	2017-11-18 21:09:42 -05:00
PikalaxALT	bd30e5aa24	sub_800C12C	2017-11-18 20:55:57 -05:00
PikalaxALT	728532be77	Return stuff to its rightful place, and set up struct definitions for later	2017-11-18 20:33:53 -05: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
PikalaxALT	f25cdb4837	resolve questionable file boundary decision	2017-11-18 15:15:54 -05:00
PikalaxALT	648f3245c1	through sub_800C054	2017-11-18 15:00:38 -05: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
PikalaxALT	06c1908d00	through sub_800BFCC	2017-11-17 08:44:54 -05:00
PikalaxALT	a054b244ab	sub_800BF4C	2017-11-17 08:33:25 -05:00
itskobold	370e47beee	Merge branch 'master' of https://github.com/pret/pokeemerald	2017-11-17 09:25:40 +00:00
PikalaxALT	8377b00662	rfu_REQ_sendData_wrapper	2017-11-17 00:05:28 -05:00
PikalaxALT	3c20c54b83	sub_800BEC0	2017-11-16 23:37:09 -05:00
PikalaxALT	cc37d7e15b	reset buffers	2017-11-16 22:13:42 -05:00
PikalaxALT	2fd6aad25a	through SendRecvDone	2017-11-16 21:38:06 -05:00
PikalaxALT	236cbf96c8	Merge origin/master into pikalaxalt/link	2017-11-16 19:00:07 -05: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
PikalaxALT	50501396b2	DoHandshake	2017-11-15 08:44:11 -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