628 Commits

Author	SHA1	Message	Date
Diegoisawesome	ebd88b3606	Merge branch 'master' of https://github.com/pret/pokeemerald into intro	2018-02-17 04:03:59 -06:00
Diegoisawesome	1605f62535	Decompile credits	2018-02-17 04:00:22 -06:00
Diegoisawesome	bc4bb5b32e	Start intro_credits_graphics decomp	2018-02-16 13:08:21 -06:00
KDSKardabox	e518a40508	[WIP} Start decomp Ground Shake	2018-02-16 15:21:27 +05:30
Diegoisawesome	0a206ee52c	Finish decompiling intro	2018-02-15 22:30:39 -06:00
KDSKardabox	ffeca135bc	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-02-16 09:29:11 +05:30
Diegoisawesome	34716558b1	Almost finish decompiling intro	2018-02-15 16:54:34 -06:00
KDSKardabox	a200d9406b	Finish fldeff_softboiled.c	2018-02-15 22:32:28 +05:30
DizzyEggg	90fa97f810	merge overworld with master	2018-02-15 12:41:32 +01:00
KDSKardabox	64683e1473	[WIP] Decompile fledd_softboiled.h	2018-02-15 15:29:26 +05:30
KDSKardabox	895c72cb26	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-02-15 09:45:15 +05:30
KDSKardabox	deeaac2bf1	Decompile fldeff_sweetsecent.c	2018-02-14 17:24:31 +05:30
golem galvanize	e1bd37dca9	fix merge conflicts	2018-02-13 22:19:14 -05:00
golem galvanize	e5b6d15f91	move data to c	2018-02-13 22:12:02 -05:00
DizzyEggg	5dde701c81	merge overworld with master	2018-02-14 01:12:17 +01:00
DizzyEggg	94b47c0686	decompile overworld	2018-02-14 00:58:22 +01:00
KDSKardabox	c959dc1174	Finish fldeff_strength.s	2018-02-13 23:08:54 +05:30
KDSKardabox	e375606810	[Do not Merge] fldeff_strength.s	2018-02-13 21:52:33 +05:30
KDSKardabox	aaea65c37b	Merge branch 'master' of https://github.com/pret/pokeemerald ... # Conflicts: # include/strings.h	2018-02-13 10:02:27 +05:30
golem galvanize	4ac064bbaf	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu	2018-02-12 14:00:47 -05:00
golem galvanize	f81c52b56e	more fixes	2018-02-12 13:59:42 -05:00
DizzyEggg	382442c4c8	start decompiling overworld.s	2018-02-12 15:01:43 +01:00
KDSKardabox	54922641af	Port smokescreen.s	2018-02-12 16:44:04 +05:30
KDSKardabox	0ca0ad1c63	Decompile birch_pc.c	2018-02-12 15:42:15 +05:30
Diegoisawesome	a4787bc06a	Merge pull request #207 from DizzyEggg/decompile_pokemon_123 ... Decompile and clean pokemon files	2018-02-11 22:13:15 -06:00
PikalaxALT	590c4b500b	Merge branch 'master' into record_mixing	2018-02-11 20:12:40 -05:00
PikalaxALT	ea347199a2	Merge branch 'master' into link	2018-02-11 19:22:06 -05:00
DizzyEggg	2736c0fd4a	add more const pokemon data, clear include	2018-02-11 23:46:50 +01:00
golem galvanize	601a942db4	decompile main_menu	2018-02-11 17:19:36 -05:00
DizzyEggg	fd17ca59b0	more pokemon work	2018-02-11 17:35:01 +01:00
DizzyEggg	084ba7a7a4	decompile all pokemon files	2018-02-10 13:24:03 +01:00
DizzyEggg	5707c5c7c6	start pokemon 3	2018-02-10 02:06:32 +01:00
golem galvanize	99d0b4bbfd	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu	2018-02-09 17:47:01 -05:00
DizzyEggg	1a1bad3129	decompile pokemon_item_effect	2018-02-09 18:46:00 +01:00
golem galvanize	de95a703b0	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu	2018-02-08 16:03:53 -05:00
Diegoisawesome	387dbf48d0	Merge pull request #202 from DizzyEggg/move_mon_data ... Move data from asm to pokemon_1.c	2018-02-08 14:06:57 -06:00
golem galvanize	03f8d0d6ce	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu	2018-02-07 19:31:33 -05:00
golem galvanize	4a903279df	decompile task_new_game_prof_birch_speech_4	2018-02-07 19:30:58 -05:00
Diegoisawesome	772fd47564	Merge branch 'master' of https://github.com/pret/pokeemerald into menu	2018-02-07 18:06:59 -06:00
golem galvanize	caf5d136b9	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu	2018-02-07 18:59:00 -05:00
DizzyEggg	4b7d778a5c	move mon data fix conflicts	2018-02-07 20:17:55 +01:00
golem galvanize	b67afb9490	I hope this fixes the conflicts	2018-02-07 14:14:08 -05:00
golem galvanize	1b303aeee8	decompiled up to task_new_game_prof_birch_speech_3	2018-02-07 14:11:08 -05:00
DizzyEggg	c5e2092e8b	title screen with master	2018-02-07 20:10:56 +01:00
Diegoisawesome	802b505d7b	Merge pull request #199 from DizzyEggg/decompile_rtc_screen ... decompile rtc reset screen	2018-02-07 13:03:59 -06:00
Diegoisawesome	ccae0ee970	Merge pull request #198 from DizzyEggg/decompile_item_icon ... decompile item icon	2018-02-07 12:59:40 -06:00
Diegoisawesome	1ae5adbb19	Merge pull request #196 from DizzyEggg/decompile_ray_scene ... Decompile rayquaza scene	2018-02-07 12:59:13 -06:00
Cameron Hall	13bc7a8dd2	Merge pull request #166 from camthesaxman/battle_refactor ... rename/refactor battle code	2018-02-07 12:46:12 -06:00
Diegoisawesome	d396a8f89c	Merge new_menu_helpers and menu	2018-02-07 00:07:42 -06:00
Diegoisawesome	18abda9dca	Finish menu.s and eliminate TextColor	2018-02-06 20:37:54 -06:00
camthesaxman	607cba8c2e	Merge branch 'master' into battle_refactor	2018-02-05 17:38:23 -06:00
DizzyEggg	541fef5368	move wild data to C	2018-02-05 22:27:29 +01:00
DizzyEggg	ae8e89a10d	move some pokemon data to c	2018-02-05 17:39:26 +01:00
golem galvanize	5f7709dc8b	decompile item_menu	2018-02-04 23:47:47 -05:00
DizzyEggg	0c60ffe22a	decompile title screen	2018-02-04 16:11:00 +01:00
PikalaxALT	d52f52fa73	Merge branch 'master' into link	2018-02-03 09:42:19 -05:00
DizzyEggg	27452ca822	decompile rtc reset screen	2018-02-02 19:00:01 +01:00
DizzyEggg	e13eacda39	decompile item icon	2018-02-02 16:06:20 +01:00
DizzyEggg	ebc8af50f1	decompile berry tag screen	2018-02-02 14:03:48 +01:00
DizzyEggg	14d2caaf8d	start decompiling berry tag screen	2018-02-02 12:32:12 +01:00
DizzyEggg	b697497835	ray scene is decompiled	2018-02-01 14:47:41 +01:00
ProjectRevoTPP	78bd2b0849	move save rodata to source and use saveblock chunk macros	2018-01-31 15:26:57 -05:00
golem galvanize	e78697494c	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu	2018-01-31 00:29:38 -05:00
ProjectRevoTPP	e7fffb5e9a	merge	2018-01-31 00:13:49 -05:00
Diegoisawesome	3167dec946	Merge pull request #188 from golemgalvanize/decompile_field_message_box ... decompile field_message_box	2018-01-30 23:11:53 -06:00
ProjectRevoTPP	09302c0bc5	Merge branch 'master' of https://github.com/pret/pokeemerald into field_map_obj_helpers	2018-01-30 23:23:45 -05:00
Diegoisawesome	eb5737357d	Merge pull request #194 from DizzyEggg/decompile_mystery_event_menu ... decompile mystery event menu	2018-01-30 20:33:27 -06:00
golem galvanize	f7c9a6cb54	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu	2018-01-30 19:38:24 -05:00
ProjectRevoTPP	c5f1b576f2	Merge branch 'master' of https://github.com/pret/pokeemerald into field_map_obj_helpers	2018-01-30 18:24:14 -05:00
ProjectRevoTPP	6453b88433	finish decompiling field_map_obj_helpers.c	2018-01-30 18:19:41 -05:00
DizzyEggg	9fbedcc41c	coord weather fix conflicts	2018-01-31 00:02:16 +01:00
DizzyEggg	741b8adf9a	decompile mystery event menu	2018-01-30 23:23:35 +01:00
Diegoisawesome	b3315b64a1	Merge pull request #187 from golemgalvanize/decompile_item_use ... decompile item_use	2018-01-30 15:41:43 -06:00
Diegoisawesome	232dea1a63	Merge pull request #193 from DizzyEggg/decompile_scanline_effect ... decompile scanline effect	2018-01-30 15:37:34 -06:00
golem galvanize	231b69451b	fixed	2018-01-30 16:33:20 -05:00
Diegoisawesome	6873f47821	Merge pull request #190 from DizzyEggg/decompile_time_events ... decompile time events	2018-01-30 15:20:24 -06:00
golem galvanize	59b0e69820	adding ld_script	2018-01-30 13:22:59 -05:00
DizzyEggg	db3ecf5012	decompile scanline effect	2018-01-29 17:47:12 +01:00
DizzyEggg	e6fb626c1f	decompile_coord_event_weather	2018-01-29 16:46:56 +01:00
DizzyEggg	d728124a7b	decompile time events	2018-01-29 15:55:34 +01:00
DizzyEggg	78fc471f32	mon anim with master	2018-01-29 14:40:50 +01:00
DizzyEggg	ed546d680f	pokemon animation is decompiled	2018-01-29 12:36:56 +01:00
ProjectRevoTPP	3eaaa59c04	start decompiling field_map_obj_helpers	2018-01-29 04:13:15 -05:00
golem galvanize	2a16b7cb81	decompile field_message_box	2018-01-28 00:22:06 -05:00
golem galvanize	b377112cd6	decompile item_use	2018-01-27 22:58:44 -05:00
Diegoisawesome	2da7bdbb11	Begin menu.s decomp	2018-01-26 23:41:52 -06:00
Diegoisawesome	7d8a2ae7f0	Decompile new_menu_helpers.s	2018-01-25 15:25:35 -06:00
Diegoisawesome	0c47cd6fc3	Renamed link_strings and fixed warning in fldeff_cut.s	2018-01-24 00:18:10 -06:00
Diegoisawesome	5784098446	Organization and naming	2018-01-23 23:14:22 -06:00
Diegoisawesome	5a57485ece	Decompile naming_screen.c	2018-01-23 21:30:13 -06:00
DizzyEggg	ad73f92061	start decompiling pokemon animation	2018-01-22 21:32:50 +01:00
camthesaxman	663ecd0014	Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor	2018-01-21 22:29:35 -06:00
PikalaxALT	d4e8c20f84	Merge branch 'master' into link	2018-01-21 23:20:13 -05:00
Diegoisawesome	2ba141eac4	Merge pull request #182 from DizzyEggg/decompile_hof_pc ... decompile hof pc	2018-01-21 15:10:26 -06:00
DizzyEggg	f59eedb672	decompile hof pc	2018-01-21 20:45:43 +01:00
DizzyEggg	f53a39e7a2	mystery event labels	2018-01-21 19:30:01 +01:00
DizzyEggg	e0fbd5daad	text window cleanup	2018-01-21 13:32:11 +01:00
DizzyEggg	ad2ef517bd	option menu fix conflicts	2018-01-21 12:46:19 +01:00
DizzyEggg	0bc7fb92db	start decompiling mystery event script	2018-01-21 12:36:11 +01:00
PikalaxALT	772f0aa3fd	Merge branch 'master' into link	2018-01-20 22:08:41 -05:00
scnorton	c6ff1a6ce3	Merge branch 'master' into link	2018-01-18 12:53:31 -05:00
DizzyEggg	295aa96a05	decompile unk transition	2018-01-16 23:57:26 +01:00
camthesaxman	b4bb562363	rename battle_2.c to battle_main.c	2018-01-16 16:15:02 -06:00
DizzyEggg	4dd06dbcd3	optiom menu move data to C	2018-01-16 19:39:35 +01:00
DizzyEggg	a6072ae293	decompile option menu	2018-01-16 18:59:06 +01:00
DizzyEggg	05aba58d5d	fix battle transition conflicts	2018-01-14 22:19:26 +01:00
DizzyEggg	d7644cd3d8	battle transition is decompiled	2018-01-14 22:09:35 +01:00
DizzyEggg	fdbe7fa7de	up to 30 battle transitions	2018-01-14 20:45:44 +01:00
ProjectRevoTPP	e19c51cd10	scrub ld_script for bloat	2018-01-09 01:26:27 -05:00
ProjectRevoTPP	dd2d49144b	Merge branch 'master' of https://github.com/pret/pokeemerald into assert	2018-01-07 20:01:56 -05:00
Diegoisawesome	75f9c16504	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-01-07 18:47:05 -06:00
Diegoisawesome	a11c65ff1a	Port field_door	2018-01-07 17:50:13 -06:00
Diegoisawesome	efe19e95c8	Extract door animations	2018-01-07 01:29:26 -06:00
ProjectRevoTPP	7be61cfb1a	add assert support to pokeemerald.	2018-01-06 21:12:42 -05:00
Diegoisawesome	4f726232b8	Merge remote-tracking branch 'EternalCode/master'	2018-01-01 16:31:35 -06:00
DizzyEggg	ba176dfe07	start working on battle transition	2018-01-01 17:41:34 +01:00
Diegoisawesome	f0df833f37	Extract easy chat and pokemon animation	2017-12-29 13:34:24 -06:00
Diegoisawesome	1496ea3a24	Merge branch 'master' of github.com:pret/pokeemerald	2017-12-28 03:00:15 -06:00
Diegoisawesome	2d04eb22ab	Split rom_81370FC and port function names	2017-12-28 02:09:11 -06:00
Diegoisawesome	ca49f8438d	Extract battle_transition data	2017-12-27 15:25:15 -06:00
Diegoisawesome	f9a9391ff3	Split/extract/port landmark	2017-12-26 21:20:29 -06:00
Diegoisawesome	ba130d469d	Split/extract pokedex cry screen data	2017-12-26 16:18:18 -06:00
Diegoisawesome	eff0caf759	Split and extract roulette data	2017-12-26 01:42:08 -06:00
Diegoisawesome	15c92318d3	Extract data from misc files ... Also split data4d.s	2017-12-25 00:32:01 -06:00
DizzyEggg	43f23b8a78	Merge branch 'master' into dump_pointers	2017-12-24 11:15:00 +01:00
DizzyEggg	8cd4908fa3	merge bike with master, fix conflicts	2017-12-24 00:08:55 +01:00
DizzyEggg	e647cb2308	dump start menu and a bit of textwindow and trainercard	2017-12-23 19:23:55 +01:00
DizzyEggg	4f6ca126b5	dump all rayquaza scene data to C	2017-12-23 13:23:23 +01:00
DizzyEggg	e7111984a9	start rayquaza dumping	2017-12-23 00:22:07 +01:00
DizzyEggg	3ca5af4d5d	do some pointer storage system hunting	2017-12-22 20:10:51 +01:00
DizzyEggg	9c45ca0c5f	dump pokemon icon	2017-12-22 19:16:15 +01:00
DizzyEggg	cddd44834e	Merge branch 'master' into dump_pointers	2017-12-22 16:22:16 +01:00
sceptillion	3c286feec6	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs	2017-12-22 00:17:34 -08:00
sceptillion	44415f1bbe	rename songs to reflect internal names	2017-12-21 23:14:37 -08:00
sceptillion	4cb9f8db76	name phoneme songs	2017-12-21 20:51:09 -08:00
sceptillion	d6987ee9b9	dump songs	2017-12-21 14:30:11 -08: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
DizzyEggg	6b5157b2a3	decompile bike.s	2017-12-21 17:46:03 +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	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
Diegoisawesome	6a674e1e83	Merge remote-tracking branch 'Egg/decompile_mail_data'	2017-12-17 22:51:40 -06: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
scnorton	3c2b1731ee	Merge branch 'master' into link	2017-12-17 14:09:06 -05:00