650 Commits

Author	SHA1	Message	Date
DizzyEggg	cddd44834e	Merge branch 'master' into dump_pointers	2017-12-22 16:22:16 +01:00
Diegoisawesome	4a4a10a990	Merge remote-tracking branch 'pret/master'	2017-12-22 03:10:09 -06:00
Diegoisawesome	8278583e7b	Extract baseroms from battle_anim files	2017-12-22 02:45:03 -06:00
sceptillion	3c286feec6	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs	2017-12-22 00:17:34 -08:00
sceptillion	96511dc214	use internal song names	2017-12-22 00:10:20 -08:00
sceptillion	d6987ee9b9	dump songs	2017-12-21 14:30:11 -08:00
Diegoisawesome	0403f6eea9	Merge remote-tracking branch 'Egg/decompile_use_pokeblock'	2017-12-21 16:19:50 -06:00
DizzyEggg	bcffcb0c1c	pokeblock merge conflicts	2017-12-21 23:12:36 +01:00
DizzyEggg	19c25a8f2b	start dumping pokedex	2017-12-21 22:56:20 +01:00
Marcus Huderle	173761a5a1	Port generic event script macros from pokeruby	2017-12-21 13:47:52 -06:00
Diegoisawesome	4307292f55	Merge remote-tracking branch 'Egg/kobold_fixes'	2017-12-21 11:42:10 -06:00
DizzyEggg	6b5157b2a3	decompile bike.s	2017-12-21 17:46:03 +01:00
DizzyEggg	b4b3fe04ee	pr dump review changes	2017-12-20 17:24:37 +01:00
DizzyEggg	8380fc63dc	Merge branch 'master' into kobold_fixes	2017-12-20 17:22:25 +01:00
DizzyEggg	504363f2a6	Merge branch 'master' into decompile_trainer_see	2017-12-20 17:21:46 +01:00
DizzyEggg	b615af4184	fix pokeblock merge conflicts	2017-12-20 17:16:56 +01:00
DizzyEggg	38af0f78ea	hopefully fix kobold PR	2017-12-19 20:52:52 +01:00
DizzyEggg	37a6e1b6c7	Merge branch 'master' of https://github.com/itskobold/pokeemerald into kobold_fixes	2017-12-19 20:09:28 +01:00
DizzyEggg	7581218569	Merge branch 'master' into decompile_battle1	2017-12-19 17:37:53 +01:00
DizzyEggg	5744356989	decompile trainer see	2017-12-18 23:26:44 +01:00
DizzyEggg	a612ef12a0	start working on trainer see	2017-12-18 19:35:50 +01:00
DizzyEggg	cb229f56e8	fix pokeblock conflicts	2017-12-18 16:58:14 +01: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	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	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	9525fdd54d	convert more constants	2017-12-11 12:41:13 -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	37ae6a7758	move more pokeblock data to C and label	2017-12-10 16:38:27 +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	790df7159e	more battlescript labels	2017-12-03 00:47:21 +01:00
DizzyEggg	e10aea9a51	give some more labels to battle struct fields	2017-12-02 23:31:58 +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
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
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
Cameron Hall	6e317c6463	Merge pull request #124 from DizzyEggg/dump_battlescripts ... Dump Battle Scripts	2017-11-27 14:00:29 -06: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	d48392e677	change battle variables names	2017-11-26 18:07:00 +01:00
DizzyEggg	59f64c622b	name more battlescripts	2017-11-26 17:26:11 +01:00
DizzyEggg	1bb5b1fd07	more battle labels	2017-11-26 17:15:28 +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	76f4a8b195	clean up and use names for printfromtable	2017-11-26 00:33:40 +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	2746967bef	through sub_8134CE8	2017-11-24 20:46:29 -05:00
PikalaxALT	24009ea941	through Cb2_StartWallClock and associated data	2017-11-24 19:49:03 -05:00
PikalaxALT	2280614a14	Start decompiling data	2017-11-24 19:06:01 -05:00
PikalaxALT	f54f2c424f	LoadWallClockGraphics	2017-11-24 18:00:26 -05:00
PikalaxALT	772da493f9	data/unk_81BAD84	2017-11-23 21:15:57 -05:00
itskobold	deec6f21db	Pointer fixes etc ... Fixed up the last of my old dumps	2017-11-23 10:48:56 +00:00
itskobold	40638a48e7	battle_frontier_1.s fix ... sorted out most of the other raw pointers	2017-11-22 15:15:58 +00:00
itskobold	a9f7a41edd	battle_frontier_1 buncha pointers fixed	2017-11-22 13:05:28 +00:00
itskobold	caf952e02e	Merge branch 'master' of https://github.com/pret/pokeemerald	2017-11-20 18:27:23 +00:00
DizzyEggg	4e25ef10f2	wild encounter review changes	2017-11-20 16:40:02 +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	8fd3081306	start working on berry blender	2017-11-18 16:11:34 +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	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
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	ce0e5cbfe4	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps	2017-11-15 00:47:34 -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	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	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
PikalaxALT	1ca032c6ff	Address review items, 1	2017-11-12 21:13:18 -05:00
DizzyEggg	c967ba1d5f	dump couple of baseroms review changes	2017-11-12 18:41:04 +01:00
Diegoisawesome	6e6e11205d	Fix capitalized symbol names	2017-11-11 18:17:46 -06:00
Diegoisawesome	f497c1508b	Split files from event_scripts.s ... Also move maps/scripts to scripts/maps	2017-11-11 16:10:17 -06:00
itskobold	e373cf4bb9	field_effect dataroms ... quite a few pointers and stuff done	2017-11-11 15:26:39 +00:00
itskobold	1e495b2837	contest_painting.s, cute_sketch.s ... simple stuff	2017-11-11 15:05:05 +00: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	d5af24fb2d	Extract tilesets	2017-11-10 12:46:01 -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	455a979819	Add dummy Sootopolis map connections	2017-11-09 19:21:54 -06:00
Diegoisawesome	f61810a8f9	Dump maps	2017-11-09 19:21:31 -06:00
Diegoisawesome	e6ef86e4b0	Update variable and flag names	2017-11-08 15:20:10 -06:00
DizzyEggg	045e7d6382	split starter choose data	2017-11-08 20:53:39 +01:00
DizzyEggg	61408456e8	starter choose file is decompiled	2017-11-08 18:05:47 +01:00
itskobold	0e69dcd30c	more work on battle_frontier_1.s ... added a few window_templates and pointer tables	2017-11-08 09:51:20 +00:00
itskobold	bb28d9ef40	easy_chat.s	2017-11-08 08:32:41 +00:00
itskobold	fd80cc40c0	daycare.s ... a few pointers	2017-11-07 23:23:09 +00:00
itskobold	b2cb7ba58c	contest.s, region_map.s, trainer_rematch.s ... all partially done	2017-11-07 23:11:17 +00:00
itskobold	aedec0865d	Labels	2017-11-07 22:04:52 +00:00
itskobold	45b28d08ba	mystery_event_msg.s ... also fixed a couple of other files	2017-11-07 21:24:39 +00:00
itskobold	ffeeb20299	mauville_old_man.s ... progress	2017-11-07 20:47:43 +00:00
itskobold	da2335f10c	naming_screen.s update ... made it more readable	2017-11-07 20:09:38 +00:00
itskobold	0f541e703d	shop.s, menu_indicators.s, naming_screen.s ... all only partially done	2017-11-07 19:46:00 +00:00
itskobold	4c514a50bf	field_screen.s ... partially done	2017-11-07 18:59:33 +00:00
itskobold	f844eab31b	baseroms ... fieldmap.s fldeff_cut.s (partially)	2017-11-07 18:31:19 +00:00
itskobold	dedae4a1d0	battle_frontier_1.s, unk_transition.s dumproms ... still a fair bit to dump for battle_frontier_1.s	2017-11-07 14:51:51 +00: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	99e697223f	get rid of two baseroms	2017-11-05 00:25:09 +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
PikalaxALT	ab3b8cd51a	Merge branch 'master' into heal_location	2017-11-02 07:59:29 -04:00