1292 Commits

Author	SHA1	Message	Date
Kermalis	119a78d896	Match mus_rg_dendou.mid	2018-10-01 21:22:56 -04:00
Kermalis	6a9b972491	Match mus_rg_demo.mid	2018-10-01 16:08:57 -04:00
Kermalis	602ca92b3b	Match mus_rg_cycling.mid	2018-10-01 16:05:57 -04:00
Kermalis	d13822fbe1	Match mus_rg_champ_r.mid	2018-10-01 16:02:50 -04:00
Kermalis	e38a3e532f	Match mus_rg_annai.mid	2018-10-01 15:58:31 -04:00
Kermalis	ddfdb8d0fe	Match mus_rg_ajito.mid	2018-10-01 15:47:18 -04:00
Kermalis	4dae354858	Match mus_me_rg_photo.mid	2018-10-01 14:59:38 -04:00
Kermalis	1af5e63b41	Match mus_yama_eye.mid	2018-09-29 16:33:41 -04:00
Kermalis	c5463ca1da	Match mus_vs_rekku.mid	2018-09-29 16:30:15 -04:00
Kermalis	2ffa3a2c87	Match mus_vs_mew.mid	2018-09-29 16:28:18 -04:00
Kermalis	de8b7e6fde	Match mus_vs_front.mid	2018-09-29 16:24:08 -04:00
Kermalis	a300a9799c	Match mus_tsuretek.mid	2018-09-29 03:26:30 -04:00
Kermalis	3893291d8d	Match mus_tozan.mid [TOOK 3 HOURS]	2018-09-29 03:21:07 -04:00
Kermalis	1e7ad3d964	Match mus_tonekusa.mid	2018-09-29 00:50:43 -04:00
Kermalis	5ee5f49591	Match mus_title3.mid	2018-09-29 00:48:55 -04:00
Kermalis	caadbc11cc	Match mus_thankfor.mid	2018-09-29 00:46:35 -04:00
Kermalis	120b92bae1	Match mus_tetsuji.mid	2018-09-29 00:44:51 -04:00
Kermalis	392f16f653	Match mus_test4.mid	2018-09-29 00:43:00 -04:00
Kermalis	b598030f46	Match mus_test3.mid	2018-09-29 00:41:35 -04:00
Kermalis	fdbb817990	Match mus_test2.mid	2018-09-29 00:39:46 -04:00
Kermalis	2689a0ffe6	Match mus_test1.mid	2018-09-29 00:38:28 -04:00
Kermalis	20bf0966dd	Match mus_test.mid	2018-09-29 00:36:36 -04:00
Kermalis	4b3149e299	Match mus_t_battle.mid	2018-09-29 00:33:33 -04:00
Kermalis	90525e03ed	Match mus_syoujoeye.mid	2018-09-29 00:30:53 -04:00
Kermalis	dc4821267d	Match mus_swimeye.mid	2018-09-29 00:28:22 -04:00
Kermalis	c22fcda723	Match mus_suikun.mid	2018-09-29 00:25:10 -04:00
Kermalis	48caaf4eb2	Match mus_sitennou.mid	2018-09-29 00:22:56 -04:00
Kermalis	9cc155e0a7	Match mus_shinka.mid	2018-09-29 00:19:53 -04:00
Kermalis	927fa4b384	Match mus_sattower.mid	2018-09-29 00:17:49 -04:00
Kermalis	fc36f7a3e5	Match mus_safari.mid	2018-09-29 00:12:54 -04:00
Kermalis	a55cce930a	Match mus_runecity.mid	2018-09-29 00:10:18 -04:00
Kermalis	55f8e4aed7	Match mus_rekkuu_kourin.mid	2018-09-29 00:06:37 -04:00
Kermalis	6d205b8ac0	Match mus_rainbow.mid	2018-09-29 00:04:20 -04:00
Kermalis	c3ab8a3bff	Match mus_pyramid_top.mid	2018-09-29 00:02:21 -04:00
Kermalis	b531882f01	Match mus_pyramid.mid	2018-09-28 23:59:57 -04:00
Kermalis	8c6b4f45fc	Match mus_pokecen.mid	2018-09-28 23:58:00 -04:00
Kermalis	c2d7c43847	Match mus_pcc.mid	2018-09-28 23:56:10 -04:00
Kermalis	8ab0a2aa5f	Match mus_p_school.mid	2018-09-28 23:54:02 -04:00
Kermalis	2d6953b440	Match mus_ooame.mid	2018-09-28 23:51:36 -04:00
Kermalis	b9af4288a1	Match mus_odamaki.mid	2018-09-28 23:48:47 -04:00
Kermalis	1814174d03	Match mus_nibi.mid	2018-09-28 23:46:30 -04:00
Kermalis	e8c1c3879b	Match mus_nextroad.mid	2018-09-28 23:42:15 -04:00
Kermalis	0761db312f	Match mus_mishiro.mid	2018-09-28 23:10:57 -04:00
Kermalis	ce1b101f9f	Match mus_minamo.mid	2018-09-28 23:08:04 -04:00
Kermalis	61abaaf201	Match mus_mgm0.mid	2018-09-28 23:04:18 -04:00
Kermalis	d547ce5302	Match mus_me_zannen.mid	2018-09-28 23:01:00 -04:00
Kermalis	3f926eab92	Match mus_me_waza.mid	2018-09-28 22:55:22 -04:00
Kermalis	585f11d025	Match mus_me_wasure.mid	2018-09-28 22:43:35 -04:00
Kermalis	f632869c02	Match mus_me_tore_eye.mid	2018-09-28 22:39:17 -04:00
Kermalis	02deef99fd	Match mus_me_tama.mid	2018-09-28 22:27:08 -04:00
Kermalis	1903d37f1c	Match mus_me_symbolget.mid	2018-09-28 22:21:33 -04:00
Kermalis	faa3c2a48e	Match mus_me_shinka.mid	2018-09-28 22:11:21 -04:00
Kermalis	bcf8104c92	Match mus_me_pointget.mid	2018-09-28 22:07:26 -04:00
Kermalis	e2e53a86c7	Match mus_me_kinomi.mid	2018-09-28 22:02:01 -04:00
Kermalis	3a384da6d6	Match mus_me_bachi.mid	2018-09-28 21:59:48 -04:00
Kermalis	6a102c4192	Match mus_me_b_small.mid	2018-09-28 21:56:33 -04:00
Kermalis	05d012b1a7	Match mus_me_b_big.mid	2018-09-28 19:31:55 -04:00
Kermalis	6e1118c602	Match mus_me_asa.mid	2018-09-28 17:27:41 -04:00
Kermalis	32c0fbd35a	Match mus_machupi.mid	2018-09-28 17:21:09 -04:00
Kermalis	b916203c88	Match mus_machi_s4.mid	2018-09-28 17:18:52 -04:00
Kermalis	ce3b52f650	Match mus_machi_s3.mid	2018-09-28 17:16:00 -04:00
Kermalis	8e5fc7964a	Match mus_machi_s2.mid	2018-09-28 17:13:51 -04:00
Kermalis	0dcd1c9da5	Match mus_maborosi.mid	2018-09-28 17:11:33 -04:00
Kermalis	6b5a0589ee	Match mus_m_dungon.mid	2018-09-28 17:07:34 -04:00
Kermalis	60f13e6075	Match mus_m_boat.mid	2018-09-28 17:03:36 -04:00
Kermalis	c67dead63d	Match mus_kazanbai.mid	2018-09-27 00:10:53 -04:00
Kermalis	7ec2803e9c	Match mus_karakuri.mid	2018-09-26 23:57:32 -04:00
Kermalis	f9c89f3f6a	Match mus_kakkoii.mid	2018-09-26 23:55:22 -04:00
Kermalis	29bc694de5	Match mus_kachi22.mid	2018-09-26 23:53:27 -04:00
Kermalis	59814a6fcf	Match mus_kachi3.mid (Thanks Diego)	2018-09-26 23:49:51 -04:00
Kermalis	21bd6c9e34	Match mus_kachi5.mid	2018-09-26 20:26:40 -04:00
Kermalis	26b8b36717	Match mus_kachi4.mid	2018-09-26 20:22:23 -04:00
Kermalis	f2bfa4409a	Match mus_kachi2.mid	2018-09-26 19:48:30 -04:00
Kermalis	fbc74f20c3	Match mus_kachi1.mid	2018-09-26 19:43:31 -04:00
Kermalis	c9cef8f631	Match mus_inter_v.mid	2018-09-26 19:40:24 -04:00
Kermalis	ac4b91d602	Match mus_hutago.mid	2018-09-26 19:37:55 -04:00
Kermalis	68b0db70a8	Match mus_hightown.mid	2018-09-26 19:35:23 -04:00
Kermalis	aac997896a	Match mus_hideri.mid	2018-09-26 19:33:29 -04:00
Kermalis	b1bcaa8add	Match mus_hageshii.mid	2018-09-26 19:31:11 -04:00
Kermalis	495c287a5e	Match mus_granroad.mid	2018-09-26 19:28:14 -04:00
Kermalis	b7b95fd582	Match mus_gotown.mid	2018-09-26 19:13:45 -04:00
Kermalis	d3bedad347	Match mus_gomachi0.mid	2018-09-26 19:06:26 -04:00
Kermalis	a2e816b33a	Match mus_girleye.mid	2018-09-26 19:04:26 -04:00
Kermalis	a91981c796	Match mus_girl_sup.mid	2018-09-26 19:01:13 -04:00
Kermalis	d3d03d4d7a	Match mus_gim.mid	2018-09-26 18:58:19 -04:00
Kermalis	b1398ec08a	Match mus_fune_kan.mid	2018-09-26 18:56:08 -04:00
Kermalis	a8ad043ff9	Match mus_friendly.mid	2018-09-26 18:54:12 -04:00
Kermalis	157cad7ba7	Match mus_finecity.mid	2018-09-26 18:52:03 -04:00
Kermalis	b2100c1d3b	Match mus_field13.mid	2018-09-26 18:48:54 -04:00
Kermalis	c597ef4f73	Match mus_fanfa5.mid	2018-09-26 18:46:33 -04:00
Kermalis	6a76feddbf	Match mus_fanfa4.mid	2018-09-26 18:44:24 -04:00
Kermalis	f334a3c4da	Match mus_fanfa1.mid	2018-09-26 18:41:29 -04:00
Kermalis	c744979fdd	Match se_z_search.mid	2018-09-26 03:43:43 -04:00
Kermalis	8c7ceee0b5	Match mus_event0.mid	2018-09-26 03:27:01 -04:00
Kermalis	094b7d4eaf	Match mus_end.mid	2018-09-26 03:17:13 -04:00
Kermalis	042bad2d43	Match mus_eikou_r.mid	2018-09-25 23:47:55 -04:00
Kermalis	2606eafb59	Match mus_dummy.mid	2018-09-25 23:12:58 -04:00
Kermalis	412fb0b459	Match mus_dooro1.mid	2018-09-25 23:03:18 -04:00
Kermalis	014aa3d137	Match mus_dooro_x4.mid	2018-09-25 23:00:10 -04:00
Kermalis	03bbff5a5a	Match mus_dooro_x3.mid	2018-09-25 22:57:29 -04:00
Kermalis	9cc3a8331a	Match mus_dooro_x1.mid	2018-09-25 22:47:44 -04:00
Kermalis	686ba9eb99	Match mus_daigo.mid	2018-09-25 22:22:02 -04:00
Kermalis	f480337dbc	Match mus_dendou.mid	2018-09-25 20:32:01 -04:00
Kermalis	d5047d6545	Match mus_demo1.mid	2018-09-25 20:23:51 -04:00
Kermalis	304baaf49e	Match mus_deepdeep.mid	2018-09-25 20:19:36 -04:00
Kermalis	13cc134a5c	Match mus_dan03.mid	2018-09-25 20:17:26 -04:00
Kermalis	214846e790	Match mus_dan02.mid	2018-09-25 20:13:08 -04:00
Kermalis	2e4b7511e5	Match mus_dan01.mid	2018-09-25 20:07:10 -04:00
Kermalis	1b575e20d7	Match mus_cycling.mid	2018-09-25 17:34:37 -04:00
Kermalis	e8a081d0f2	Match mus_contest0.mid	2018-09-25 17:32:45 -04:00
Kermalis	1e7eefd5cc	Match mus_conlobby.mid	2018-09-25 17:30:31 -04:00
Kermalis	8936bb2772	Match mus_con_k.mid	2018-09-25 17:25:36 -04:00
Kermalis	e58bc7fb9e	Match mus_con_fan.mid	2018-09-25 17:20:10 -04:00
Kermalis	c501f63be7	Match mus_casino.mid	2018-09-25 17:17:30 -04:00
Kermalis	1768c542db	Match mus_c_road.mid	2018-09-25 17:14:25 -04:00
Kermalis	179541bc2a	Match mus_boyeye.mid	2018-09-25 17:11:50 -04:00
Kermalis	e3b385624e	Match mus_boy_sup.mid	2018-09-25 17:07:26 -04:00
Kermalis	4da711d64b	Match mus_bijyutu.mid	2018-09-25 17:02:54 -04:00
Kermalis	1c4da06bfa	Match mus_bd_time.mid	2018-09-25 16:59:56 -04:00
Kermalis	17610d37ec	Match mus_battle38.mid	2018-09-25 16:53:58 -04:00
Kermalis	3327c587f0	Match mus_battle36.mid	2018-09-25 16:52:00 -04:00
Kermalis	8896ce87ec	Match mus_battle35.mid	2018-09-25 16:49:19 -04:00
Kermalis	11cfa5fdc0	Match mus_battle34.mid	2018-09-25 16:47:25 -04:00
Kermalis	4249d0d34f	Match mus_battle33.mid	2018-09-25 16:44:58 -04:00
Kermalis	f8016d30c5	Match mus_battle32.mid	2018-09-25 16:43:02 -04:00
Kermalis	425eeb3c07	Match mus_battle31.mid	2018-09-25 16:40:09 -04:00
Kermalis	e1841a111d	Match mus_battle30.mid	2018-09-25 16:37:29 -04:00
Kermalis	51805c02af	Match mus_battle27.mid	2018-09-25 16:32:48 -04:00
Kermalis	08715af6ac	Match mus_battle20.mid	2018-09-25 16:28:35 -04:00
Kermalis	d396871781	Match mus_b_tube.mid	2018-09-25 14:32:56 -04:00
Kermalis	2bb647245a	Match mus_b_tower.mid	2018-09-25 02:42:54 -04:00
Kermalis	357b159b86	Match mus_b_factory.mid	2018-09-24 00:43:25 -04:00
Kermalis	dbfc4b00e1	Match mus_b_palace.mid	2018-09-24 00:39:24 -04:00
Kermalis	257427ffdc	Match mus_b_frontier.mid	2018-09-24 00:05:45 -04:00
Kermalis	6049308461	Match mus_b_dome1.mid	2018-09-23 23:31:01 -04:00
Kermalis	297b24cb20	Match mus_b_dome.mid	2018-09-23 23:28:02 -04:00
Kermalis	db3d988a76	Match mus_b_arena.mid	2018-09-23 23:25:34 -04:00
Kermalis	2b0d340ba5	Match mus_ropeway.mid	2018-09-23 23:20:44 -04:00
Kermalis	aceb85e11e	Match mus_ayasii.mid	2018-09-23 23:16:58 -04:00
Kermalis	e602329505	Match mus_ashroad.mid	2018-09-23 22:35:20 -04:00
Kermalis	5d52f64c04	Match mus_aqa_0.mid	2018-09-23 22:10:30 -04:00
Kermalis	4fc0cb095c	Match mus_naminori.mid	2018-09-23 17:12:59 -04:00
Diegoisawesome	a63f3ce872	Set up Makefile for MIDIs	2018-09-22 20:28:32 -05:00
Diegoisawesome	6a8f27c1ac	Merge pull request #326 from DizzyEggg/cablecarutil ... Decompile cable_car_util.c	2018-09-16 01:06:33 -05:00
DizzyEggg	4d2637883a	Slot machine is decompiled.	2018-09-15 23:19:37 +02:00
DizzyEggg	ff13cb6352	decompile cable car util which has nothing to do with actual cable car	2018-09-15 13:50:23 +02:00
Diegoisawesome	095cbbc5c2	Merge pull request #321 from Slawter666/data ... Move more data to C	2018-09-11 22:10:26 -05:00
Slawter666	f40fa37398	Move battle_bg data to C	2018-09-11 23:37:47 +01:00
Slawter666	991151f461	Move item_use data to C	2018-09-11 03:04:19 +01:00
Slawter666	3c16d8c598	Move braille_puzzles data to C	2018-09-11 02:17:21 +01:00
Slawter666	b6ee8823f0	Move field_special_scene data to C	2018-09-11 02:04:03 +01:00
Slawter666	bcea321494	Finish converting data2b data	2018-09-11 01:35:47 +01:00
DizzyEggg	b87856b58e	Battle Factory is decompiled and documented.	2018-09-10 01:01:39 +02:00
Slawter666	1ba17e1666	Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data	2018-09-09 15:51:13 +01:00
Diegoisawesome	cf8f73bde1	Merge pull request #314 from Slawter666/data ... Convert data to C	2018-09-07 11:39:07 -05:00
Slawter666	9ad7dc9fd7	Move remaining field_player_avatar data across	2018-09-06 12:02:37 +01:00
Diegoisawesome	f8f7a8e300	Merge pull request #304 from Slawter666/graphics ... Move data from graphics.s to C	2018-09-05 20:32:23 -05:00
Slawter666	9350ac0a74	Move battle_pyramid_bag data to C	2018-09-06 01:24:11 +01:00
Slawter666	07c2882390	Move starter_choose data to C	2018-09-06 00:47:29 +01:00
Slawter666	5656ceab6c	Move graphics to src/data/graphics	2018-09-05 23:53:54 +01:00
DizzyEggg	75384546b5	More factory decomp and documentation.	2018-09-05 23:30:15 +02:00
DizzyEggg	0238b1c8ec	More battle factory work	2018-09-02 19:41:33 +02:00
Marcus Huderle	8ecf3b2159	Start decompiling shop.c	2018-09-01 17:15:35 -05:00
DizzyEggg	917b32ffbe	Finish decompiling pyramid bag.	2018-08-30 20:10:57 +02:00
DizzyEggg	ddd4733de3	rename battle pyramid to battle pyramid bag	2018-08-26 17:54:58 +02:00
DizzyEggg	78cad0dee5	try battle tent and fail	2018-08-26 15:27:06 +02:00
DizzyEggg	447e65860c	Merge branch 'master' into decompile_battle_frontier_1	2018-08-25 20:02:09 +02:00
DizzyEggg	edcf04b665	Document battle dome.	2018-08-25 19:59:47 +02:00
Slawter666	6b145ed77c	Move data from graphics.s to C	2018-08-24 04:21:07 +01:00
Slawter666	ef6a3c2278	Move some data from data2b.s to C	2018-08-22 14:34:36 +01:00
DizzyEggg	fb19a8fc59	battle dome cards sensibly renamed	2018-08-19 01:06:10 +02:00
DizzyEggg	0bfe894566	Merge with master	2018-08-16 22:53:01 +02:00
Diegoisawesome	13dc7a4170	Merge branch 'master' of github.com:pret/pokeemerald	2018-08-15 16:22:54 -07:00
DizzyEggg	a54fa23b5f	Begin battle frontier 1	2018-08-15 15:49:50 +02:00
DizzyEggg	92c4fc6345	Contest AI clean-up	2018-08-15 11:50:18 +02:00
Diegoisawesome	332a8bcb1d	Extract rodata for unk_pokedex_area_screen_helper	2018-08-14 22:37:59 -07:00
Diegoisawesome	a07d69d7c2	Finish pokemon_summary_screen	2018-08-14 22:00:35 -07:00
DizzyEggg	1a0e6f7aed	match contest effect	2018-08-13 21:24:11 +02:00
Diegoisawesome	6dac87abfd	Cleanup and document learn_move	2018-08-12 14:28:15 -07:00
DizzyEggg	0d68af7f06	copy contest effect from ruby	2018-08-12 23:20:17 +02:00
Diegoisawesome	9a73a47ddd	Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move	2018-08-12 12:55:21 -07:00
Diegoisawesome	2dd5fc23d4	Prepare learn_move for merge	2018-08-12 12:54:07 -07:00
Diegoisawesome	25832810f6	Merge pull request #288 from DizzyEggg/slot_machine ... Port a little bit of slot machine	2018-08-12 12:27:23 -07:00
Diegoisawesome	32b0e102cf	Merge pull request #287 from DizzyEggg/easy_chat ... Pikalax's Easy chat	2018-08-12 12:17:23 -07:00
Diegoisawesome	6bb761a711	Merge pull request #277 from atasro2/player_field_avatar ... decompile a portion of field_player_avatar.s	2018-08-12 12:09:09 -07:00
MCboy	1bc93c5a66	Merge branch 'master' into player_field_avatar	2018-08-12 23:26:00 +04:30
DizzyEggg	957dcd01b3	merge with master	2018-08-12 12:11:35 +02:00
Diegoisawesome	a000eb4f36	Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move	2018-08-11 19:03:38 -07:00
Diegoisawesome	cf9518f237	Merge branch 'master' of github.com:pret/pokeemerald	2018-08-11 16:32:03 -07:00
DizzyEggg	df5009cb3e	Move move descriptions to C	2018-08-12 00:03:19 +02:00
Diegoisawesome	b54793be91	Finish decompiling field_specials	2018-08-11 14:51:54 -07:00
DizzyEggg	537ebd36ac	Merge contests with master	2018-08-11 19:04:28 +02:00
DizzyEggg	7961aa44ba	start porting slot machine	2018-08-11 17:57:20 +02:00
DizzyEggg	59d8d56868	merge easy chat with master	2018-08-11 14:14:51 +02:00
Diegoisawesome	90896e38c9	Begin porting/decompiling field_specials	2018-08-08 01:37:12 -07:00
Diegoisawesome	7270e73fee	Move strings to C	2018-07-25 01:15:36 -07:00
Diegoisawesome	e92e2cb0aa	Merge branch 'master' of github.com:pret/pokeemerald	2018-07-24 21:18:36 -07:00
Diegoisawesome	156fb472e1	Clean up files and add entries to charmap	2018-07-24 21:18:23 -07:00
Diegoisawesome	5883f867f0	Merge pull request #278 from vblm12/trainer_data ... Move some trainer data into c structs	2018-07-24 18:58:56 -07:00
MCboy	64f40bbfee	Add field_player_avatar to rodata	2018-07-24 17:03:16 +04:30
DizzyEggg	1e9143e0b2	merge union room with master	2018-07-22 13:14:58 +02:00
vblm12	29276cc76c	Move some trainer data from data2b.s to c structs.	2018-07-20 22:14:31 -05:00
MCboy	663bb3112a	add player_field_avatar.c	2018-07-19 21:15:35 +04:30
Diegoisawesome	5189442bcc	Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut	2018-07-05 20:32:12 -07:00
DizzyEggg	0fe3e612eb	battle tent start and create frontier struct in saveblock	2018-06-17 12:30:09 +02:00
DizzyEggg	3bcd30969a	cut field effect is decompiled and documented	2018-06-16 14:04:29 +02:00
Marcus Huderle	aa9a45c16f	Rebrand 'map object' and 'field object' to 'event object'	2018-06-11 19:11:48 -05:00
Marcus Huderle	ed245b677a	Add remaining rodata to event_object_movement.c	2018-06-11 18:17:31 -05:00
Marcus Huderle	89edf6d9e9	Move all field object data into src/data and event_object_movement.c	2018-06-11 17:33:50 -05:00
Marcus Huderle	eb8dbff4a7	Move event_object_movement_helpers into event_object_movement	2018-06-11 10:56:14 -05:00
Marcus Huderle	73327f0d44	Decompile field_ground_effect into event_object_movement.c	2018-06-11 10:23:14 -05:00
Marcus Huderle	38a126df66	Rename field_map_obj to event_object_movement	2018-06-11 08:46:33 -05:00
DizzyEggg	dbb9cdd424	more link stuff	2018-06-04 12:07:32 +02:00
Diegoisawesome	0b09575fd4	Merge pull request #249 from golemgalvanize/decompile_pokedex ... Decompile pokedex	2018-06-01 00:02:46 -07:00
Diegoisawesome	dd28854a22	Merge pull request #255 from DizzyEggg/decomp_record_mixing ... Fix pika's Record Mixing PR Also closes #107.	2018-05-30 16:51:30 -07:00
DizzyEggg	ff0c615870	decompile rom_8034C54	2018-05-27 23:26:01 +02:00
DizzyEggg	b051cbaaab	more record mixing decomp	2018-05-25 21:00:41 +02:00
PikalaxALT	6ae395a636	Merge branch 'master' into contest	2018-05-24 10:26:55 -04:00
Diegoisawesome	489f90b832	Update Makefile with help from devkitPro maintainers	2018-05-22 18:46:38 -05:00
DizzyEggg	4d5bfc149e	Merge branch 'master' into decomp_record_mixing	2018-05-20 12:16:45 +02:00
Diegoisawesome	de60bdf2fe	Merge pull request #256 from DizzyEggg/decompile_field_tasks ... Decompile field tasks	2018-05-19 23:34:30 -05:00
DizzyEggg	d1798d0ed9	decompile field tasks	2018-05-19 18:02:43 +02:00
DizzyEggg	e44f35c7b7	fix record mixing merge conflicts	2018-05-19 12:32:44 +02:00
DizzyEggg	4857757431	merge list menu and list indicators	2018-05-19 11:36:31 +02:00
DizzyEggg	1ead30ad40	decompile menu indicators	2018-05-19 10:54:02 +02:00
DizzyEggg	303c9f0917	start menu indicators decomp	2018-05-16 22:16:22 +02:00
DizzyEggg	0cf3836a03	decompile menu helpers	2018-05-15 20:22:19 +02:00
DizzyEggg	7735fb2ad3	start menu helpers decomp	2018-05-14 23:03:40 +02:00
PikalaxALT	4488bbe9e6	Merge branch 'master' into contest	2018-05-11 09:25:26 -04:00
Diegoisawesome	2b6d2dfadd	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-05-10 18:38:24 -05:00
Diegoisawesome	416d67c832	Finish porting/decompiling field_effect.c	2018-05-10 18:36:57 -05:00
PikalaxALT	dfc83cf28f	Merge branch 'master' into contest	2018-05-10 09:47:12 -04:00
Diegoisawesome	80062972ae	Begin porting field_effect	2018-05-10 03:02:33 -05:00
golem galvanize	13efa1ef62	fixing conflicts	2018-05-10 03:34:36 -04:00
golem galvanize	d31600e70e	finish decompiling pokedex	2018-05-10 03:30:42 -04:00
PikalaxALT	4470f77b3d	Merge branch 'master' into mauville_old_man	2018-05-09 15:30:21 -04:00
Diegoisawesome	b570f87152	Merge master from pret	2018-05-09 05:10:23 -05:00
Diegoisawesome	d66c1c642c	Port/decompile fieldmap.c	2018-05-09 05:07:56 -05:00
PikalaxALT	fd1d75ce37	Merge branch 'master' into mauville_old_man	2018-05-07 18:18:00 -04:00
PikalaxALT	0231ed13ee	Remaining functions in mauville_old_man	2018-05-07 16:35:29 -04:00
Slawter666	279a6e1ddc	Convert item_icon_table.inc to C	2018-05-06 13:37:28 +01:00
Slawter666	aab1238ec0	Revert "Convert item_graphics.inc to C" ... This reverts commit 546217d281.	2018-05-06 09:12:23 +01:00
Slawter666	546217d281	Convert item_graphics.inc to C ... I have tried to group the items that share the same icon but have different palettes where possible. This commit also splits data/graphics.s into two files.	2018-05-05 23:27:26 +01:00
Slawter666	22ec43a6ed	resolve merge conflicts	2018-05-05 18:50:26 +01:00
PikalaxALT	58200616d5	Merge branch 'master' into trader	2018-05-04 17:45:50 -04:00
PikalaxALT	8aa462cd74	through sub_8121178	2018-05-03 18:05:07 -04:00
Marcus Huderle	cdb5e9e314	Merge pull request #242 from DizzyEggg/decompile_battle_records ... Decompile battle records	2018-05-03 08:42:44 -07:00
PikalaxALT	21c3e7e8e5	through SetMauvilleOldMan	2018-05-02 11:31:58 -04:00
PikalaxALT	4b1e30434d	Through sub_80D787C	2018-05-01 19:47:11 -04:00
PikalaxALT	4acbcf5759	Port trader from Ruby	2018-05-01 15:19:24 -04:00
DizzyEggg	ae78786723	identify and name battle records things	2018-05-01 15:33:13 +02:00
DizzyEggg	95cf853762	battle records more decomp and subtle name changes	2018-05-01 14:01:54 +02:00
DizzyEggg	f9a2f6c4a2	start decompiling battle records	2018-05-01 12:38:55 +02:00
DizzyEggg	25c669e36b	decompile item	2018-04-29 13:36:26 +02:00
Slawter666	39fd42faea	convert data/items.inc to include/data/items.h ... OK	2018-04-25 02:33:55 +01:00
Slawter666	a49f80d552	Convert item_descriptions.inc to .h ... OK	2018-04-25 01:41:04 +01:00
Slawter666	a9d65ae6b6	Move files to include/data	2018-04-24 00:58:14 +01:00
Slawter666	a04f8f6ee3	Convert item data files to .c (not compiling)	2018-04-23 21:44:46 +01:00
Diegoisawesome	d10844f1fe	Merge pull request #237 from KDSKardabox/master ... Decompile mon markings, rotating_gate & field_camera	2018-04-18 14:12:51 -05:00
Diegoisawesome	4e63a52832	Merge pull request #238 from DizzyEggg/decompile_battle_anim_sound_tasks ... decompile battle_anim_sound_tasks	2018-04-18 11:40:01 -05:00
DizzyEggg	3d12a02f3e	almost decomp sound tasks battle anim	2018-04-18 16:03:15 +02:00
KDSKardabox	7700fe61fe	Decompile field camera	2018-04-18 17:42:41 +05:30
KDSKardabox	b818924feb	Decompile rotating_rate & remove debug check	2018-04-18 14:09:50 +05:30
KDSKardabox	f5cbefc295	Decompile mon markings	2018-04-17 14:24:39 +05:30
KDSKardabox	936bb5925a	Decompile dewford trend	2018-04-16 16:22:13 +05:30
KDSKardabox	447afe4505	Decompile pokemon icon	2018-04-13 17:51:49 +05:30
KDSKardabox	66e76d9633	Decompile script movement	2018-04-10 14:55:25 +05:30
KDSKardabox	a3d065d0bd	Decompile rom6	2018-04-10 12:17:29 +05:30
KDSKardabox	a18dc6aa80	Decompile map_name_popup	2018-04-09 12:52:28 +05:30
KDSKardabox	3948614bff	Decompile map_obj_lock	2018-04-03 16:22:31 +05:30
Edouard Veyrier	b2e8ee836d	sub_81607EC and sub_816082C	2018-04-02 20:06:40 +02:00
Edouard Veyrier	6e919da4aa	Change order in ld_script.txt	2018-03-29 20:41:29 +02:00
Edouard Veyrier	17b9f5d892	Fix compile error	2018-03-29 15:46:10 +02:00
Marcus Huderle	a5cd6e8ef4	Merge pull request #231 from KDSKardabox/master ... Player PC	2018-03-28 21:45:24 -07:00
Marcus Huderle	d4c6ef7ae6	Merge pull request #227 from PikalaxALT/pokenav_match_call ... Pokenav match call	2018-03-28 21:33:50 -07:00
Anders Løvig	6cd590f4fd	Decompiled start_menu.s	2018-03-28 00:40:00 +02:00
KDSKardabox	f9f64fff42	Resolve conflicts	2018-03-19 16:15:13 +05:30
KDSKardabox	a24ffb1321	Finish decompiling player_pc rodata	2018-03-19 15:57:33 +05:30
KDSKardabox	a454bd98fa	Finish .text part of player_pc	2018-03-16 16:01:11 +05:30
KDSKardabox	e7cf8e5c17	Start decompile player_pc	2018-03-12 13:56:20 +05:30
DizzyEggg	711a345fd4	fix conflicts	2018-03-09 22:54:57 +01:00
PikalaxALT	7b9930a0a2	Remaining data in match_call	2018-03-04 16:58:51 -05:00
PikalaxALT	9b25d02369	Match call data, 1	2018-03-04 16:14:56 -05:00
PikalaxALT	734375f101	Remaining functions in match_call	2018-03-04 15:47:54 -05:00
DizzyEggg	4c3f8ac6c6	start item menu icons decomp	2018-03-04 18:41:07 +01:00
DizzyEggg	18a92fdcc0	list menu is decompiled	2018-03-03 14:58:41 +01:00
PikalaxALT	df128cbfed	Merge branch 'master' into pokenav_match_call	2018-03-02 21:49:09 -05:00
DizzyEggg	ae29f35afd	start decompiling list menu	2018-03-02 16:34:31 +01:00
PikalaxALT	988be1ab86	Carve out Match Call functions	2018-02-28 22:47:50 -05:00
KDSKardabox	85492c0dac	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-03-01 09:13:29 +05:30
KDSKardabox	2f9d69f67f	use free_and_set_null macros	2018-03-01 09:11:26 +05:30
DizzyEggg	988f0b7e19	Merge branch 'master' into decompile_battle_link_817C95C	2018-03-01 01:01:18 +01:00
Diegoisawesome	bcef4e7d1c	Merge pull request #221 from DizzyEggg/data_to_c ... Move some data to C	2018-02-28 16:55:45 -06:00
Diegoisawesome	a57e04e14d	Merge pull request #220 from PikalaxALT/trainer_rematch ... Decompile trainer_rematch	2018-02-28 16:41:54 -06:00
DizzyEggg	85a959f321	clean up files	2018-02-28 13:07:58 +01:00
DizzyEggg	59ff4aec9b	decompile and document battle tv	2018-02-27 20:40:09 +01:00
PikalaxALT	7f7b182ca4	sub_81D1574	2018-02-27 08:47:47 -05:00
KDSKardabox	835777dec2	Decompile fleff_flash rodata	2018-02-27 10:33:23 +05:30
PikalaxALT	f46e941f30	Name functions, variables, and that one flag constant	2018-02-26 08:23:17 -05:00
KDSKardabox	2d7d686cc1	Decompile fldeff_flash	2018-02-26 17:54:54 +05:30
DizzyEggg	8821d6396a	move battle moves to C	2018-02-26 12:59:52 +01:00
PikalaxALT	6bfc8579ad	Decompile trainer_rematch	2018-02-25 21:56:09 -05:00
DizzyEggg	558133bba0	almost match	2018-02-24 13:44:26 +01:00
KDSKardabox	48fdddf638	Bring non-matchings in a compiling state	2018-02-22 15:15:03 +05:30
KDSKardabox	a3c17fad22	Decompile Fossil Special & Groundshake Data	2018-02-22 12:17:46 +05:30
DizzyEggg	25a57093b1	start battle link file	2018-02-20 02:01:51 +01:00
KDSKardabox	9719e2fa22	Start decompile fossil_specials.s	2018-02-19 15:37:02 +05:30
KDSKardabox	5ed68a87f8	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-02-18 17:35:36 +05:30
KDSKardabox	b1cb82fc67	Finish fldeff_groundshake	2018-02-18 17:33:48 +05:30
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
PikalaxALT	190a2cba61	Merge branch 'master' into link	2017-12-16 11:27:10 -05:00
DizzyEggg	c3abe2863f	rename	2017-12-16 15:12:55 +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	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
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
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
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
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	10068b0345	Merge branch 'master' into field_poison	2017-11-29 08:19:54 -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
DizzyEggg	b0657350a4	berry blender fix merge conflicts	2017-11-26 19:21:51 +01:00
PikalaxALT	a875d665b8	Merge branch 'master' into easy_chat	2017-11-25 10:56:55 -05:00
PikalaxALT	f9c3aeb919	sub_8135380	2017-11-24 22:30:20 -05:00
PikalaxALT	2746967bef	through sub_8134CE8	2017-11-24 20:46:29 -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	ab569cc466	clock.s	2017-11-24 14:57:00 -05:00
PikalaxALT	772da493f9	data/unk_81BAD84	2017-11-23 21:15:57 -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