1411 Commits

Author	SHA1	Message	Date
DizzyEggg	a7f94bbeea	Dump last battle anim file	2019-02-02 11:55:11 +01:00
DizzyEggg	b4055e4fc0	Merge m4a files into one, get rid of one asm	2019-02-01 10:37:13 +01:00
DizzyEggg	7750a8126d	CgbSound is decompiled.	2019-02-01 00:25:31 +01:00
DizzyEggg	7bc4a3b3f7	Merge with master	2019-01-29 22:12:53 +01:00
Marcus Huderle	e81838dba3	Misc. documentation and move some data into .c files	2019-01-29 14:36:02 -06:00
DizzyEggg	94d2a30d44	Merge with master	2019-01-28 20:41:46 +01:00
DizzyEggg	ad59811154	Decompile whole contest	2019-01-28 18:13:07 +01:00
DizzyEggg	897592a8d4	Merge branch 'master' into battle_engine_v2	2019-01-27 10:58:57 +01:00
DizzyEggg	01c3f3fc05	Document all of frontier pass	2019-01-26 20:56:06 +01:00
DizzyEggg	4e396207d3	document more of trainer card	2019-01-20 18:24:35 +01:00
shinny456	1b30da21d9	merge trainer hill changes	2019-01-19 10:44:58 -05:00
DizzyEggg	2c3210f4d1	merge with master	2019-01-18 22:30:34 +01:00
Diegoisawesome	6857b73ee3	Split pokenav so calcrom works properly	2019-01-14 15:25:29 -06:00
DizzyEggg	4b420643dc	Merge branch 'master' into trainer_hill	2019-01-13 20:51:05 +01:00
DizzyEggg	c0bc01d301	Move some vars to C	2019-01-13 13:15:23 +01:00
DizzyEggg	11a49a7f02	Decompile trainer hill	2019-01-13 12:12:27 +01:00
Philipp AUER	f53279b1e1	add DWARF debug sections to ld_script.txt	2019-01-11 10:41:51 -06:00
shinny456	8a5fce7837	start decompiling trainer_card.s	2019-01-08 21:51:19 -05:00
DizzyEggg	4827776a3c	Merge with master	2019-01-05 10:14:20 +01:00
Marcus Huderle	fd201f8395	Start decompiling contest_link_80F57C4.c	2019-01-03 20:35:20 -06:00
Marcus Huderle	2857f7fff9	Decompile contest_link_81D9DE4.c	2019-01-03 20:35:20 -06:00
Marcus Huderle	bc43dbab13	Decompile contest_link_81D9DE4.c	2019-01-03 20:35:20 -06:00
Marcus Huderle	e1092028ec	Decompile match_call.c	2019-01-02 19:46:15 -06:00
Diegoisawesome	6202ae1df0	Extract rodata from roulette	2019-01-02 16:40:40 -06:00
Diegoisawesome	e7f8190ba3	Finish roulette port	2019-01-01 15:25:52 -06:00
Diegoisawesome	439fa13e94	Start porting/decompiling roulette	2018-12-31 16:09:45 -06:00
nullableVoidPtr	7c57699fa5	Remove sed from ld_script, replace with INCLUDEs	2019-01-01 00:38:49 +08:00
Diegoisawesome	d004ce065c	Merge branch 'master' of github.com:pret/pokeemerald into trade	2018-12-31 02:30:30 -06:00
Diegoisawesome	c5c6e437ec	Document, cleanup, extract data from trade	2018-12-31 01:23:27 -06:00
Diegoisawesome	c22a12d8d6	trade source done	2018-12-29 13:50:24 -06:00
DizzyEggg	55e44b0951	a bit more of contest painting effect	2018-12-29 11:48:28 -06:00
Marcus Huderle	8eea0925c5	Finish battle_anim_effects_3.c	2018-12-29 11:40:12 -06:00
DizzyEggg	517573eb4b	Update with master	2018-12-26 17:46:51 +01:00
Diegoisawesome	d8948a5cda	Merge remote-tracking branch 'pret/master' into trade	2018-12-25 15:03:13 -06:00
Marcus Huderle	dcbc8db6a3	Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)	2018-12-25 11:46:35 -06:00
DizzyEggg	e230afd543	Merge branch 'master' into learn	2018-12-24 22:01:52 +01:00
DizzyEggg	442b1826a2	asm party and fldeff clean-up	2018-12-24 21:59:05 +01:00
Marcus Huderle	c2fdbb0ef7	Decompile psychic.c	2018-12-24 10:52:56 -06:00
Marcus Huderle	f1213ebb4b	Decompile dark.c	2018-12-24 09:55:00 -06:00
DizzyEggg	6fa5f33519	Merge branch 'master' into battle_engine_v2	2018-12-24 09:07:18 +01:00
DizzyEggg	efa820469a	move data to c	2018-12-23 14:52:47 +01:00
DizzyEggg	6d57a9dfc8	start data converting	2018-12-23 13:52:53 +01:00
DizzyEggg	ef55bdac89	Merge branch 'master' into battle_engine_v2	2018-12-22 23:57:42 +01:00
Diegoisawesome	ebbe826133	Merge pull request #437 from DizzyEggg/storage ... Pokemon Storage System	2018-12-22 16:12:27 -06:00
DizzyEggg	e54dd6a02b	Merge with master	2018-12-22 13:53:07 +01:00
golem galvanize	314b718471	finish porting ice	2018-12-21 01:37:59 -05:00
DizzyEggg	ecee02816d	Merge with master	2018-12-20 22:53:08 +01:00
golem galvanize	64832ff67e	start ice	2018-12-20 16:20:34 -05:00
DizzyEggg	7dcb614cca	PSS is done	2018-12-20 22:14:36 +01:00
Diegoisawesome	6ef9671718	Merge pull request #440 from garakmon/fldeff ... Decompile / port fldeff_80F9BCC	2018-12-19 22:16:59 -06:00
garak	5eac3ce1a2	rename fldeff_misc	2018-12-19 22:19:54 -05:00
Diegoisawesome	48d7c0a7a3	Merge pull request #454 from golemgalvanize/decompile_party_menu ... Decompile party menu	2018-12-19 19:57:31 -06:00
golem galvanize	cd785011fe	decompiled water	2018-12-19 10:31:37 -05:00
Diegoisawesome	2592803460	Merge branch 'master' of github.com:pret/pokeemerald into trade	2018-12-18 19:54:27 -06:00
Diegoisawesome	cd994f4935	Begin trade.c	2018-12-18 19:29:41 -06:00
golem galvanize	f7df299be8	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_water	2018-12-18 20:23:32 -05:00
golem galvanize	15a7b1bc08	begin water.s	2018-12-18 20:23:07 -05:00
Marcus Huderle	b2ac3b6d6f	Decompile most of battle_anim_effects_3.c	2018-12-18 19:15:59 -06:00
Marcus Huderle	d2b5a0e83f	Convert battle_anim_815A0D4 data to .c	2018-12-18 19:15:59 -06:00
golem galvanize	8781d969ff	finish party_menu	2018-12-18 05:38:08 -05:00
golem galvanize	c259ee46d3	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-12-18 05:31:39 -05:00
Marcus Huderle	c04ce0ee64	Decompile battle_anim_effects_2.c	2018-12-17 22:16:17 -06:00
golem galvanize	076d07f6fe	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-12-17 02:40:30 -05:00
shinny456	60484153a5	decompile electric.s	2018-12-16 22:23:05 -05:00
garak	e292d0ca83	Merge branch 'master' into fldeff	2018-12-16 20:05:31 -05:00
Marcus Huderle	d1e6e705cc	Decompile battle_anim_effects_1.c	2018-12-16 11:39:22 -06:00
Marcus Huderle	1ca3656d74	Decompile contest_painting.c (#447)	2018-12-15 13:07:07 -06:00
Marcus Huderle	2c6849bee8	Decompile battle_anim_8170478.c (#445)	2018-12-13 21:33:54 -06:00
golem galvanize	6748ef72fb	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-12-13 00:31:06 -05:00
Marcus Huderle	170b6ef449	Decompile battle_intro.c (#444)	2018-12-12 23:18:25 -06:00
Diegoisawesome	bfdfe367e8	Merge pull request #422 from garakmon/frontier_data_1 ... Battle tower data	2018-12-10 11:22:16 -06:00
garak	b4312648e2	decompile fldeff_80F9BCC with data	2018-12-09 19:22:59 -05:00
Marcus Huderle	a7722a0b93	Decompile cable_car.c (#438)	2018-12-09 13:41:52 -06:00
Marcus Huderle	342d23e0ba	Merge pull request #436 from KDSKardabox/master ... Decompile ghost	2018-12-09 07:59:32 -06:00
KDSKardabox	4233ae50c3	Finish decompile ghost	2018-12-09 18:38:15 +05:30
DizzyEggg	180aa839c4	Fix conflicts	2018-12-09 13:12:02 +01:00
DizzyEggg	c46499b05c	field screen review changes	2018-12-09 12:16:01 +01:00
DizzyEggg	4683cdc30c	Merge branch 'master' into weather	2018-12-09 11:56:50 +01:00
KDSKardabox	8712757d24	Merge remote-tracking branch 'upstream/master'	2018-12-09 13:44:41 +05:30
KDSKardabox	f8838491f6	Initial commit for ghost	2018-12-09 13:44:07 +05:30
Diegoisawesome	0b91d2948a	Merge pull request #429 from nullableVoidPtr/master ... Various fixes and cleanups	2018-12-08 21:44:12 -06:00
DizzyEggg	606fb71392	Fix ld script	2018-12-08 22:17:49 +01:00
DizzyEggg	b94ae8bb92	Merge branch 'master' into weather	2018-12-08 22:10:20 +01:00
DizzyEggg	4ec14b3d43	Finish field screen	2018-12-08 22:05:11 +01:00
DizzyEggg	58c4cec946	decompile field screen	2018-12-08 21:42:36 +01:00
DizzyEggg	5caca7a4d6	Clean up field weather	2018-12-08 19:43:21 +01:00
Marcus Huderle	88ffb09765	Merge pull request #432 from KDSKardabox/master ... De-compile fire	2018-12-08 12:41:08 -06:00
KDSKardabox	1357449d73	Merge remote-tracking branch 'upstream/master'	2018-12-09 00:01:45 +05:30
DizzyEggg	4c23adb5f5	Decompile field weather	2018-12-08 19:05:03 +01:00
Marcus Huderle	f3a25f83cf	Decompile roulette_util.c (#434)	2018-12-08 11:56:59 -06:00
KDSKardabox	5630ab2b1e	Fully decompile fire	2018-12-08 17:55:17 +05:30
KDSKardabox	0f82e5caf7	Intial commit for decomp fire	2018-12-08 15:15:52 +05:30
DizzyEggg	470df386c9	Fix conflicts	2018-12-07 23:01:14 +01:00
golem galvanize	53fac4417b	fixing merge conflicts	2018-12-07 14:47:20 -05:00
nullableVoidPtr	3909b6408c	Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 ... Some of the INVALID_ are likely erroneously placed, due to lack of documentation	2018-12-06 09:44:08 +08:00
garak	80c3258504	finish battle tower data except sRubyFacilityClassToEmerald	2018-12-04 12:09:35 -05:00
DizzyEggg	d8b952f94c	Clean up items data	2018-12-03 13:37:32 +01:00
DizzyEggg	ad67f4f26f	Merge with master and REQ arguments	2018-12-02 22:05:23 +01:00
DizzyEggg	e17140536a	finish link rfu and fix rom 8011dc0	2018-12-02 11:58:50 +01:00
DizzyEggg	3934eac8d4	Merge branch 'master' into battle_engine_v2	2018-12-01 10:28:11 +01:00
Marcus Huderle	0e32a3adf3	Decompile normal.c (#414)	2018-11-30 17:29:55 -06:00
DizzyEggg	7fa55704b2	merge with master	2018-11-30 20:46:09 +01:00
Marcus Huderle	9dd7f8f214	Decompile pokedex_area_screen.c (#412)	2018-11-30 10:41:03 -06:00
Marcus Huderle	0148e38973	Decompile pokedex_cry_screen.c (#406)	2018-11-28 10:14:32 -06:00
Marcus Huderle	9fafa63743	Finish decompiling internation_string_util.c	2018-11-27 17:21:23 -06:00
DizzyEggg	7cfe0342f0	Finish frontier data	2018-11-27 22:45:50 +01:00
garak	50f00b0827	Merge remote-tracking branch 'upstream/master' into fldeff	2018-11-27 13:31:07 -05:00
garak	73cce79753	Merge remote-tracking branch 'upstream/master' into frontier-data	2018-11-27 11:35:19 -05:00
garak	091b5194e7	frontier pike and pyramid data	2018-11-27 11:21:48 -05:00
Slawter666	deb7adbad5	Convert pokédex data to C	2018-11-27 04:00:38 +00:00
Marcus Huderle	2425a14b19	Decompile fight.c	2018-11-26 10:25:51 -06:00
Marcus Huderle	35c0fb5154	Decompile ground.c	2018-11-26 09:55:31 -06:00
Marcus Huderle	839c629d5b	Decompile dragon.c	2018-11-26 09:31:03 -06:00
Marcus Huderle	9b1f2ccf5e	Decompile poison.c	2018-11-26 09:13:45 -06:00
Marcus Huderle	2c2431aa4c	Decopmile bug.c (#399)	2018-11-26 09:03:50 -06:00
Marcus Huderle	5947e0d229	Decompile rock	2018-11-25 17:00:18 -06:00
Marcus Huderle	fb6120da5b	Fixup some names	2018-11-25 15:50:54 -06:00
Marcus Huderle	256bfc3caa	Decompile script_pokemon_util_80F87D8	2018-11-25 15:32:22 -06:00
DizzyEggg	2216d49890	Merge branch 'master' into battle_engine_v2	2018-11-23 21:40:06 +01:00
Kermalis	27d46fa3a8	Match se_t_ooame_e.mid	2018-11-20 18:10:25 -05:00
Kermalis	60a7134710	Match se_t_ooame.mid	2018-11-20 18:09:21 -05:00
Kermalis	fc57e8dd52	Match se_t_koame_e.mid	2018-11-20 18:07:28 -05:00
Kermalis	bfb84d3073	Match se_t_kami2.mid	2018-11-20 18:06:03 -05:00
Kermalis	83f73b7fd7	Match se_t_kami.mid	2018-11-20 18:04:42 -05:00
Kermalis	67d2009d7d	Match se_t_ame_e.mid	2018-11-20 18:02:42 -05:00
Kermalis	5395fc8b57	Match se_t_koame.mid	2018-11-20 18:01:10 -05:00
Kermalis	25d4702ac4	Match se_t_ame.mid	2018-11-20 18:00:58 -05:00
Kermalis	a00079e63b	Match se_suikomu.mid	2018-11-20 17:55:18 -05:00
Kermalis	88167d3183	Match se_select.mid	2018-11-20 17:52:47 -05:00
Kermalis	5e423fb5ea	Match se_seikai.mid	2018-11-20 17:50:34 -05:00
Kermalis	53ca39a8ac	Match se_save.mid	2018-11-20 17:49:15 -05:00
Kermalis	3941ce5cf2	Match se_ru_hyuu.mid	2018-11-20 17:47:42 -05:00
Kermalis	98831e29bb	Match se_ru_gasyan.mid	2018-11-20 17:45:44 -05:00
Kermalis	80ea58a198	Match se_ru_gashin.mid	2018-11-20 17:44:09 -05:00
Kermalis	410492dea9	Match se_ru_bari.mid	2018-11-20 17:42:11 -05:00
Kermalis	83c843474a	Match se_rg_w_door.mid	2018-11-20 17:40:34 -05:00
Kermalis	a5ddb0b4b8	Match se_rg_shop.mid	2018-11-20 17:37:10 -05:00
Kermalis	5e9076990e	Match se_rg_nawamiss.mid	2018-11-20 17:35:18 -05:00
Kermalis	f7959dff52	Match se_rg_kiteki.mid	2018-11-20 17:33:07 -05:00
Kermalis	1f8954115f	Match se_rg_help_op.mid	2018-11-20 17:30:56 -05:00
Kermalis	76cb446661	Match se_rg_help_ng.mid	2018-11-20 17:29:26 -05:00
Kermalis	7746acfb1d	Match se_rg_help_cl.mid	2018-11-20 17:27:09 -05:00
Kermalis	3eff7efd8f	Match se_rg_getting.mid	2018-11-20 17:23:09 -05:00
Kermalis	d00ae0da55	Match se_rg_excellent.mid	2018-11-20 17:20:31 -05:00
Kermalis	f2bb46c960	Match se_rg_deomov.mid	2018-11-20 17:17:48 -05:00
Kermalis	f31301340c	Match se_rg_card3.mid	2018-11-20 17:15:19 -05:00
Kermalis	0a0a41189e	Match se_rg_card2.mid	2018-11-20 17:07:00 -05:00
Kermalis	499de4f7c6	Match se_rg_card1.mid	2018-11-20 17:05:11 -05:00
Kermalis	d400b28edb	Match se_rg_bag2.mid	2018-11-20 17:03:47 -05:00
Kermalis	6b6e1882e4	Match se_rg_bag1.mid	2018-11-20 17:02:01 -05:00
Kermalis	3f7e088471	Match se_regi.mid	2018-11-20 16:59:59 -05:00
Kermalis	a3208dfdc6	Match se_reapoke.mid	2018-11-20 16:57:37 -05:00
Kermalis	d9820be5b9	Match se_poke_dead.mid	2018-11-20 16:54:15 -05:00
Kermalis	2a76f30d21	Match se_pn_on.mid	2018-11-20 16:51:23 -05:00
Kermalis	64ae0f244d	Match se_pn_off.mid	2018-11-20 16:49:48 -05:00
Kermalis	7e1b74e752	Match se_pinpon.mid	2018-11-20 16:47:19 -05:00
Kermalis	e5d535cdf4	Match se_pin.mid	2018-11-20 16:43:21 -05:00
Kermalis	34a8cc8acd	Match se_pc_on.mid	2018-11-20 16:41:05 -05:00
Kermalis	84f43a8369	Math se_pc_off.mid	2018-11-20 16:39:26 -05:00
Kermalis	b15cb16bfd	Match se_pc_login.mid	2018-11-20 16:35:23 -05:00
Kermalis	5a487b29ae	Match se_op_basyu.mid	2018-11-20 15:24:06 -05:00
Kermalis	8a26e51269	Match se_o.mid	2018-11-20 15:21:21 -05:00
Kermalis	964c943fee	Match se_nigeru.mid	2018-11-20 15:19:16 -05:00
Kermalis	e6484d42e9	Match se_naminori.mid	2018-11-20 15:16:16 -05:00
Kermalis	9c46276911	Match se_nageru.mid	2018-11-20 15:13:22 -05:00
Kermalis	59d691a5ee	Match se_n.mid	2018-11-20 15:09:29 -05:00
Kermalis	3cfee40c82	Match se_mu_pachi.mid	2018-11-20 15:07:05 -05:00
Kermalis	68cb780ac3	Match se_moter.mid	2018-11-20 15:02:24 -05:00
Kermalis	e7464b39a3	Match se_mizu.mid	2018-11-20 14:57:35 -05:00
garak	f02cb667bb	first 4 functions in fldeff	2018-11-20 09:51:54 -05:00
DizzyEggg	a5df797804	Merge branch 'master' into battle_engine_v2	2018-11-19 20:42:07 +01:00
DizzyEggg	5d5b4b853c	Merge branch 'master' into frontier	2018-11-19 17:32:32 +01:00
DizzyEggg	d22c2110de	Decompile mossdeep hym	2018-11-19 17:16:01 +01:00
Marcus Huderle	72f0a079a9	Decompile all of battle_anim_utility_funcs	2018-11-19 09:37:25 -06:00
DizzyEggg	623f1963b7	Merge with master	2018-11-18 20:49:52 +01:00
DizzyEggg	f2d3babd30	rename to mossdeep gym	2018-11-18 20:04:53 +01:00
DizzyEggg	4e37723288	Document Battle Pyramid	2018-11-18 17:52:22 +01:00
DizzyEggg	eb66b60f38	Begin battle pyramid	2018-11-17 15:30:34 +01:00
DizzyEggg	bb9dbc0c6d	Merge with master	2018-11-14 22:50:27 +01:00
DizzyEggg	69683f9572	Decompile Battle Palace	2018-11-12 15:41:19 +01:00
DizzyEggg	d5abd7b696	Document Battle Pie	2018-11-12 14:36:31 +01:00
DizzyEggg	4fb463377c	Start battle pike	2018-11-12 00:46:02 +01:00
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
DizzyEggg	e9965dd341	merge with master	2018-11-02 22:55:32 +01: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
DizzyEggg	b3ad32bbe6	Merge with master	2018-10-14 20:51:34 +02: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