1368 Commits

Author	SHA1	Message	Date
DizzyEggg	81410fee17	Factory done	2018-11-11 16:44:27 +01:00
Diegoisawesome	18839a4872	Merge remote-tracking branch 'pret/master' into script_menu	2018-11-06 20:20:56 -06:00
Diegoisawesome	054a015c95	Finish decompiling/porting script_menu	2018-11-06 20:13:40 -06:00
Diegoisawesome	9afe7a896e	Merge remote-tracking branch 'pret/master' into render_text	2018-11-06 11:40:17 -06:00
Diegoisawesome	43a8534fce	Merge remote-tracking branch 'origin/master' into render_text	2018-11-06 11:33:21 -06:00
Diegoisawesome	645830624d	Continue script_menu.c	2018-10-31 23:03:41 -05:00
DizzyEggg	90ef269426	Merge branch 'master' into battle_frontier_2	2018-10-30 21:48:18 +01:00
Diegoisawesome	2837859bdb	Merge pull request #373 from garakmon/battle-anim ... Split battle_anim_80FE840 and move data to C	2018-10-30 11:53:05 -05:00
garak	678156ff0e	remove linker script extra	2018-10-30 12:43:13 -04:00
Diegoisawesome	c8ef69a00d	Merge pull request #372 from garakmon/sprite-tags ... Synchronize sprite tags	2018-10-30 11:26:44 -05:00
DizzyEggg	3a9eeef844	Frontier, finish ranking hall	2018-10-28 21:11:53 +01:00
DizzyEggg	826d0ea2ab	Begin frontier records	2018-10-27 15:44:29 +02:00
garak	7747a891a2	finish 80FE840 data (actually)	2018-10-25 18:59:05 -04:00
garak	de90ce9123	finish 80FE840 data (almost)	2018-10-25 17:46:23 -04:00
DizzyEggg	1efdaebe23	finish decompiling battle tower	2018-10-25 21:27:10 +02:00
garak	17c26fae1a	fire, electric, ice data	2018-10-24 20:01:40 -04:00
garak	22a0b58e57	effects_2 and water data	2018-10-24 15:52:21 -04:00
garak	68814c42de	begin 80FE840 data	2018-10-23 08:25:51 -04:00
garak	5ddf6655bc	split battle_anim_80FE840.s	2018-10-22 22:08:38 -04:00
garak	2b9fd18dd4	battle_anims.s data to C	2018-10-21 22:30:20 -04:00
Diegoisawesome	32d2640dc7	Match GameClear (thanks Egg)	2018-10-21 16:24:43 -05:00
Diegoisawesome	97bbb326b8	GameClear nonsense	2018-10-20 19:53:41 -05:00
Diegoisawesome	dd3689fdbf	Finish porting/decompiling field_player_avatar	2018-10-19 00:05:54 -05:00
Diegoisawesome	6206acd2d2	Finish shop and fldeff_escalator	2018-10-18 12:05:02 -05:00
golem galvanize	2c6d634acd	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-10-17 20:03:31 -04:00
Diegoisawesome	e75f0b4f80	Port/decompile field_control_avatar	2018-10-16 21:47:08 -05:00
Diegoisawesome	a9abb930aa	Merge pull request #352 from huderlem/shop ... [WIP] Shop	2018-10-14 19:03:48 -05:00
Diegoisawesome	02049d52ee	Merge pull request #351 from DizzyEggg/apprentice ... Decompile apprentice	2018-10-14 13:20:38 -05:00
Diegoisawesome	d40e737d52	Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers ... Decompile field effect helpers	2018-10-14 12:48:18 -05:00
Slawter666	f08b56d645	Move apprentice data to C	2018-10-14 15:26:13 +01:00
DizzyEggg	84936b4260	Merge branch 'master' into apprentice	2018-10-14 15:07:16 +02:00
DizzyEggg	7a008a944a	Move 'blend_palette'.c to util.c	2018-10-14 14:43:19 +02:00
DizzyEggg	36b8a6a9a2	More apprentice work	2018-10-13 23:23:33 +02:00
DizzyEggg	a496a763ca	Merge record mixing, pokemon and global with apprentice	2018-10-13 20:38:46 +02:00
Diegoisawesome	32fbf67d47	Merge branch 'master' into shop	2018-10-13 12:55:06 -05:00
Diegoisawesome	a26380663c	Merge branch 'master' of github.com:pret/pokeemerald	2018-10-13 12:44:23 -05:00
Diegoisawesome	35c6938814	Port/decompile cable_club.s	2018-10-13 12:41:10 -05:00
Marcus Huderle	b24559d69b	Merge remote-tracking branch 'upstream/master' into shop ... # Conflicts: # asm/shop.s	2018-10-13 10:22:58 -05:00
golem galvanize	d3d725cc83	decompiled up to sub_81B0948	2018-10-11 21:23:39 -04:00
Diegoisawesome	04836db167	Start porting cable_club.c	2018-10-11 16:02:58 -05:00
Kermalis	de8013c6d1	Match se_kouka_m.mid	2018-10-10 16:47:27 -04:00
Kermalis	dd0e53a144	Match se_kouka_l.mid	2018-10-10 16:46:11 -04:00
Kermalis	7f2ddee417	Match se_kouka_h.mid	2018-10-10 16:45:01 -04:00
Kermalis	e92eabe961	Match se_kon4.mid	2018-10-10 16:42:47 -04:00
Kermalis	695d42bf46	Match se_kon3.mid	2018-10-10 16:41:40 -04:00
Kermalis	e6685e5703	Match se_kon2.mid	2018-10-10 16:40:18 -04:00
Kermalis	a9bdd34f9e	Match se_kon.mid	2018-10-10 16:39:11 -04:00
Kermalis	f471165e6c	Match se_ki_gasyan.mid	2018-10-10 16:37:38 -04:00
Kermalis	dac1ddba49	Match se_kaifuku.mid	2018-10-10 16:35:12 -04:00
Kermalis	76e3091d6d	Match se_kaidan.mid	2018-10-10 16:29:16 -04:00
Kermalis	1aae1c19ea	Match se_jyuni.mid	2018-10-10 16:27:34 -04:00
Kermalis	395e754760	Match se_jitensya.mid	2018-10-10 16:22:40 -04:00
Kermalis	2f10c5c24c	Match se_jite_pyoko.mid	2018-10-10 16:20:54 -04:00
Kermalis	471aa8eeac	Match se_jihanki.mid	2018-10-10 16:18:51 -04:00
Kermalis	2f21d2e9ab	Match se_jido_doa.mid	2018-10-10 16:17:07 -04:00
Kermalis	27f2b3b00a	Match se_i.mid	2018-10-10 16:15:30 -04:00
Kermalis	ab5c24daa6	Match se_hinsi.mid	2018-10-10 16:11:23 -04:00
Kermalis	937e9d05e8	Match se_hi_turun.mid	2018-10-10 16:09:46 -04:00
Kermalis	da9b55ea61	Match se_hazure.mid	2018-10-10 16:07:23 -04:00
Kermalis	88a4693cde	Match se_hashi.mid	2018-10-10 16:05:36 -04:00
Kermalis	9817919c23	Match se_hantei2.mid	2018-10-10 16:03:27 -04:00
Kermalis	13c617cee0	Match se_hantei1.mid	2018-10-10 16:02:20 -04:00
Kermalis	ad717c719f	Match se_fuusen3.mid	2018-10-10 15:57:41 -04:00
Kermalis	77c2afcaa9	Match se_fuusen2.mid	2018-10-10 15:56:10 -04:00
Kermalis	973fdffb2c	Match se_fuusen1.mid	2018-10-10 15:53:49 -04:00
Kermalis	72366a320b	Match se_fu_zuzuzu.mid	2018-10-10 15:50:00 -04:00
Kermalis	f31e4914aa	Match se_fu_zaku2.mid	2018-10-10 15:47:30 -04:00
Kermalis	12ec9ec536	Match se_fu_zaku.mid	2018-10-10 15:45:34 -04:00
Kermalis	e66fb45f24	Match se_expmax.mid	2018-10-10 15:42:53 -04:00
Kermalis	fd74c65631	Match se_exp.mid	2018-10-10 15:37:03 -04:00
Kermalis	599d80b937	Match se_esuka.mid	2018-10-10 15:32:04 -04:00
Kermalis	1d241702f2	Match se_elebeta.mid	2018-10-10 15:30:17 -04:00
Kermalis	c44d355f6f	Match se_e.mid	2018-10-10 15:28:17 -04:00
Kermalis	264bd34bdd	Match se_door.mid	2018-10-10 15:26:20 -04:00
Kermalis	615ad808bf	Match se_doku.mid	2018-10-10 15:24:27 -04:00
Kermalis	b985d45ddb	Match se_dendou.mid	2018-10-10 15:21:53 -04:00
Kermalis	3b929049da	Match se_daugi.mid	2018-10-10 15:17:05 -04:00
Kermalis	c0064134d1	Match se_dansa.mid	2018-10-10 15:14:49 -04:00
Kermalis	41a30f56bd	Match se_curtain1.mid	2018-10-10 15:07:53 -04:00
Kermalis	94e491357e	Match se_curtain.mid	2018-10-10 15:04:57 -04:00
Kermalis	6c890f7d9a	Match se_card.mid	2018-10-10 15:01:35 -04:00
Kermalis	f53a0ad0b6	Match se_c_syu.mid	2018-10-10 14:59:17 -04:00
Kermalis	c98f5c25d6	Match se_c_pikon.mid	2018-10-10 14:56:12 -04:00
Kermalis	b9989eaa56	Match se_c_pasi.mid	2018-10-10 14:53:47 -04:00
Kermalis	acb7b7eb5c	Match se_c_maku_u.mid	2018-10-10 14:50:48 -04:00
Kermalis	f967501b73	Match se_c_maku_d.mid	2018-10-10 14:49:10 -04:00
Kermalis	df9e2678fa	Match se_c_gaji.mid	2018-10-10 14:47:02 -04:00
Kermalis	4a8dff5ebb	Match se_bt_start.mid	2018-10-10 14:44:13 -04:00
Kermalis	33872e8899	Match se_bowa2.mid	2018-10-10 14:40:41 -04:00
Kermalis	ecf9d206e2	Match se_bowa.mid	2018-10-10 14:38:28 -04:00
Kermalis	50393acc65	Match se_boo.mid	2018-10-10 14:36:44 -04:00
Kermalis	44d003140b	Match se_bidoro.mid	2018-10-10 14:34:21 -04:00
Kermalis	66c1e8008c	Match se_basabasa.mid	2018-10-10 14:31:18 -04:00
Kermalis	005ac398fb	Match se_ban.mid	2018-10-10 14:27:30 -04:00
Kermalis	938c4a2bc6	Match se_a.mid	2018-10-10 14:24:39 -04:00
golem galvanize	803c2388ce	finish porting field_effect_helpers	2018-10-10 12:02:02 -04:00
golem galvanize	35ee9f67c0	ported some of field_effect_helpers	2018-10-09 17:32:39 -04:00
DizzyEggg	413e26e83d	port 80d51ac	2018-10-07 17:45:37 +02:00
DizzyEggg	61343d5069	Decompile battle_anim_80A9C70	2018-10-07 15:39:46 +02:00
DizzyEggg	8c834b9ae8	battle anim 80a5c6c decompiled	2018-10-07 12:32:20 +02:00
DizzyEggg	54fc92bc92	Start porting ruby battle anim file	2018-10-06 23:04:53 +02:00
Kermalis	2f99b81dd4	Match ph_cure_blend.mid to ph_trap_solo.mid	2018-10-03 17:47:57 -04:00
Kermalis	a94c66139e	Match ph_cloth_solo.mid	2018-10-03 17:26:34 -04:00
Kermalis	dbe15410de	Match ph_cloth_held.mid	2018-10-03 17:26:06 -04:00
Kermalis	458b25ec09	Match ph_cloth_blend.mid	2018-10-03 17:24:20 -04:00
Kermalis	6fd2d4ad3b	Match ph_choice_solo.mid	2018-10-03 17:22:56 -04:00
Kermalis	86f80debe2	Match ph_choice_held.mid	2018-10-03 17:21:42 -04:00
Kermalis	b32e85ac90	Match ph_choice_blend.mid	2018-10-03 17:20:10 -04:00
Kermalis	7fbc853611	Match mus_kachi2.mid & mus_rg_win_yasei.mid	2018-10-03 01:27:26 -04:00
Kermalis	7a06678768	Match mus_rg_win_tre.mid	2018-10-03 01:19:03 -04:00
Kermalis	34ee74a490	Match mus_kachi3.mid & mus_rg_win_gym.mid	2018-10-03 00:54:32 -04:00
Kermalis	937b785774	Match mus_rg_vs_yasei.mid	2018-10-03 00:13:14 -04:00
Kermalis	4045ded2fe	Match mus_rg_vs_tore.mid	2018-10-03 00:11:50 -04:00
Kermalis	2ed3b58742	Match mus_rg_vs_myu2.mid	2018-10-03 00:10:16 -04:00
Kermalis	2aeeb5f7b1	Match mus_rg_vs_last.mid	2018-10-03 00:08:37 -04:00
Kermalis	babe3d0e92	Match mus_rg_vs_gym.mid	2018-10-03 00:06:42 -04:00
Kermalis	ea765f5d88	Match mus_rg_vs_deo.mid	2018-10-03 00:04:47 -04:00
Kermalis	912f92d4ed	Match mus_rg_vs_den.mid	2018-10-03 00:03:18 -04:00
Kermalis	70ade99afb	Match mus_rg_union.mid	2018-10-03 00:01:14 -04:00
Kermalis	8f78809f29	Match mus_rg_tvnoize.mid	2018-10-02 23:59:34 -04:00
Kermalis	6c460c9461	Match mus_rg_titlerog.mid	2018-10-02 23:56:45 -04:00
Kermalis	214eefb05a	Match mus_rg_title.mid	2018-10-02 23:53:50 -04:00
Kermalis	2066705756	Match mus_rg_tamamusi.mid	2018-10-02 23:51:42 -04:00
Kermalis	a69b672ab0	Match mus_gim.mid & mus_rg_t_tower.mid	2018-10-02 22:37:41 -04:00
Kermalis	b1aa0c5b78	Match mus_rg_t_mori.mid	2018-10-02 21:42:10 -04:00
Kermalis	f043106adc	Match mus_rg_sousa.mid	2018-10-02 21:39:08 -04:00
Kermalis	f759bb4da0	Match mus_rg_slowmasara.mid	2018-10-02 21:35:32 -04:00
Kermalis	f1eb64919b	Match mus_rg_slot.mid	2018-10-02 21:31:11 -04:00
Kermalis	2a3cd99fed	Match mus_rg_shounen.mid	2018-10-02 21:29:13 -04:00
Kermalis	2811370ac0	Match mus_rg_shoujo.mid	2018-10-02 21:27:13 -04:00
Kermalis	0a40fc3073	Match mus_rg_shiruhu.mid	2018-10-02 21:24:37 -04:00
Kermalis	456a792d8e	Match mus_rg_shion.mid	2018-10-02 21:20:32 -04:00
Kermalis	e6a678abf7	Match mus_rg_sekaikan.mid	2018-10-02 21:18:48 -04:00
Kermalis	adcd05f176	Match mus_rg_seibetu.mid	2018-10-02 21:16:29 -04:00
Kermalis	58bd2e6a50	Match mus_rg_santoan.mid	2018-10-02 21:12:18 -04:00
Kermalis	96c0b03755	Match mus_rg_rocket.mid	2018-10-02 21:09:35 -04:00
Kermalis	e951c5f221	Match mus_rg_rival2.mid	2018-10-02 20:23:06 -04:00
Kermalis	56be32f90b	Match mus_rg_rival1.mid	2018-10-02 20:21:15 -04:00
Kermalis	8981a1958a	Match mus_rg_purin.mid	2018-10-02 20:19:39 -04:00
Kermalis	7c0b889d3c	Match mus_rg_pokeyashi.mid	2018-10-02 20:17:49 -04:00
Kermalis	a06e2124a1	Match mus_rg_pokefue.mid	2018-10-02 20:16:20 -04:00
Kermalis	06e39a7ebf	Match mus_rg_pokecen.mid	2018-10-02 20:12:23 -04:00
Kermalis	03aabe5bb3	Match mus_rg_p_tower.mid	2018-10-02 20:10:38 -04:00
Kermalis	b8c4f54220	Match mus_rg_otsukimi.mid	2018-10-02 20:06:19 -04:00
Kermalis	eef2fbb9c4	Match mus_rg_oshie_tv.mid	2018-10-02 19:52:12 -04:00
Kermalis	7333c00cd7	Match mus_rg_opening.mid	2018-10-02 19:40:09 -04:00
Kermalis	4e4da7a646	Match mus_rg_okurimono.mid	2018-10-02 19:37:07 -04:00
Kermalis	9b9fa16a5c	Match mus_rg_ohkido.mid	2018-10-02 19:35:12 -04:00
Kermalis	63e5b5baf2	Match mus_rg_nibi.mid	2018-10-02 16:27:02 -04:00
Kermalis	ec55b1014e	Match mus_rg_network.mid	2018-10-02 16:21:35 -04:00
Kermalis	66aac81ebe	Match mus_rg_nanashima.mid	2018-10-02 16:19:11 -04:00
Kermalis	619fe0481a	Match mus_rg_nanaiseki.mid	2018-10-02 16:16:22 -04:00
Kermalis	7fa1062faa	Match mus_nanadungeon.mid	2018-10-02 15:09:49 -04:00
Kermalis	0922e3b205	Match mus_rg_nana123.mid	2018-10-02 14:42:51 -04:00
Kermalis	173eb91fc4	Match mus_rg_nana67.mid	2018-10-02 14:41:08 -04:00
Kermalis	40fc3d6af0	Match mus_rg_nana45.mid	2018-10-02 14:39:30 -04:00
Kermalis	75d33aff3f	Match mus_rg_naminori.mid	2018-10-02 14:33:10 -04:00
Kermalis	899de63317	Match mus_rg_masara.mid	2018-10-02 14:06:50 -04:00
Kermalis	dbb81dd2b3	Match mus_rg_load03.mid	2018-10-02 14:05:05 -04:00
Kermalis	70bf57d229	Match mus_rg_load02.mid	2018-10-02 13:56:42 -04:00
Kermalis	74f53b3778	Match mus_rg_load01.mid	2018-10-02 01:21:51 -04:00
Kermalis	865398e701	Match mus_rg_kuchiba.mid	2018-10-02 01:19:11 -04:00
Kermalis	c5c9aef7bf	Match mus_rg_kinomikui.mid	2018-10-02 01:17:13 -04:00
Kermalis	8838e468e9	Match mus_rg_kenkyu.mid	2018-10-02 01:14:30 -04:00
Kermalis	246a8eff76	Match mus_rg_kaihuku.mid	2018-10-02 01:03:26 -04:00
Kermalis	b40c3a00fc	Match mus_rg_jump.mid	2018-10-02 01:00:30 -04:00
Kermalis	697eed294b	Match mus_rg_hanada.mid	2018-10-02 00:58:22 -04:00
Kermalis	dabfa339c1	Match mus_rg_gym.mid	2018-10-02 00:56:34 -04:00
Kermalis	cbf7133661	Match mus_rg_guren.mid	2018-10-02 00:54:45 -04:00
Kermalis	7a6f025d0b	Match mus_rg_get_yasei.mid	2018-10-02 00:52:37 -04:00
Kermalis	54d48abcd2	Match mus_rg_fan6.mid	2018-10-02 00:49:32 -04:00
Kermalis	33217e04d6	Match mus_rg_fan5.mid	2018-10-02 00:39:39 -04:00
Kermalis	1722664ff4	Match mus_rg_fan2.mid	2018-10-02 00:35:45 -04:00
Kermalis	d179db59a1	Match mus_rg_exeye.mid	2018-10-02 00:31:47 -04:00
Kermalis	e07680cb72	Match mus_rg_ending.mid	2018-10-02 00:29:36 -04:00
Kermalis	c684cf0659	Match mus_rg_deoeye.mid	2018-10-01 21:25:30 -04:00
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