934 Commits

Author	SHA1	Message	Date
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
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