1129 Commits

Author	SHA1	Message	Date
PikalaxALT	c15b50ac68	through prints_contest_move_description	2018-05-11 08:44:21 -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	9bee601b16	through sub_80DB174	2018-05-10 19:28:52 -04:00
PikalaxALT	508a8e5182	through sub_80DAFA0	2018-05-10 18:16:58 -04:00
PikalaxALT	7fdebe0d15	through sub_80DAE0C	2018-05-10 17:54:30 -04: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	f6fbecbc41	through sub_80DA874	2018-05-07 20:49:23 -04:00
PikalaxALT	e8bb464de9	through sub_80DA4F4	2018-05-07 19:46:48 -04:00
PikalaxALT	fd1d75ce37	Merge branch 'master' into mauville_old_man	2018-05-07 18:18:00 -04:00
PikalaxALT	61cc1d5574	Rename symbols using Ruby as a reference	2018-05-07 18:11:20 -04:00
PikalaxALT	0231ed13ee	Remaining functions in mauville_old_man	2018-05-07 16:35:29 -04:00
Slawter666	7f2329253f	requested changes	2018-05-06 17:31:50 +01:00
Slawter666	190ac275bb	Formatting item_icon_table.h	2018-05-06 13:45:56 +01:00
Slawter666	279a6e1ddc	Convert item_icon_table.inc to C	2018-05-06 13:37:28 +01:00
Slawter666	22ec43a6ed	resolve merge conflicts	2018-05-05 18:50:26 +01:00
PikalaxALT	e6cca15232	sub_80D8B38	2018-05-04 18:59:59 -04:00
PikalaxALT	58200616d5	Merge branch 'master' into trader	2018-05-04 17:45:50 -04:00
PikalaxALT	c6115a2fec	through sub_8120C0C	2018-05-03 17:03:52 -04:00
PikalaxALT	0bc7759f9b	through sub_8120748	2018-05-03 13:40:08 -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	7d446a9ef7	through sub_80D8490	2018-05-03 08:51:52 -04:00
PikalaxALT	f9230e80aa	through vblank_cb_battle	2018-05-02 19:59:00 -04:00
PikalaxALT	cae0fb8ec2	through sub_81203FC	2018-05-02 16:57:34 -04:00
PikalaxALT	21c3e7e8e5	through SetMauvilleOldMan	2018-05-02 11:31:58 -04:00
PikalaxALT	4bf0950421	through sub_80D7DE8	2018-05-02 08:43:27 -04:00
PikalaxALT	ef29d17c41	through sub_80D7B24	2018-05-01 21:27:24 -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
golem galvanize	f9331f15ef	decompiled up to sub_80BFCF4	2018-04-30 20:41:17 -04:00
DizzyEggg	9f97646724	make item compile	2018-04-29 15:34:14 +02:00
DizzyEggg	fd40e93cb5	clear item, save and load save files	2018-04-29 14:21:59 +02:00
DizzyEggg	25c669e36b	decompile item	2018-04-29 13:36:26 +02:00
golem galvanize	6a401b5386	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex	2018-04-25 00:28:57 -04: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	5a7a0d621c	minor documentation of constants/items.h	2018-04-24 00:17:09 +01:00
Slawter666	2d4ab9f4ac	Updated items.c ... Working but non-matching	2018-04-23 23:25:03 +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	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	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	2f96282c7f	cleaner	2018-04-03 00:10:19 +02:00
Edouard Veyrier	b2e8ee836d	sub_81607EC and sub_816082C	2018-04-02 20:06:40 +02:00
Edouard Veyrier	09e29a5cf8	Fix three functions to have the right checksum	2018-04-01 18:22:09 +02:00
golem galvanize	069a7e71fc	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex	2018-03-30 16:49:08 -04:00
golem galvanize	3006ff177b	pushing so I can pull from master	2018-03-30 16:48:30 -04:00
Edouard Veyrier	17b9f5d892	Fix compile error	2018-03-29 15:46:10 +02:00
Edouard Veyrier	cfacd23248	Fix temporarily	2018-03-29 11:56: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	3f4c717d5c	Rename stuff for more consistency	2018-03-29 02:16:02 +02:00
Anders Løvig	57775a946d	Rename start menu functions	2018-03-28 21:09:27 +02:00
Edouard Veyrier	75b07292c9	Translate first functions of learn move	2018-03-28 19:20:20 +02:00
Anders Løvig	5bc8ee6465	Added static modifers	2018-03-28 15:45:35 +02: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	1f7fb45d0f	Decompile more functions	2018-03-15 16:07:24 +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
Diegoisawesome	ae214eca8b	Merge pull request #226 from DizzyEggg/decompile_list_menu ... Decompile list menu	2018-03-09 15:49:36 -06:00
PikalaxALT	aa2cb6a974	Rename match call assets	2018-03-06 08:52:29 -05:00
DizzyEggg	62e849a5df	item menu is done	2018-03-04 20:03:11 +01: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	87274b9eed	more list menu work	2018-03-03 01:02:07 +01:00
DizzyEggg	ae29f35afd	start decompiling list menu	2018-03-02 16:34:31 +01:00
DizzyEggg	edf2ea45b1	merge with master	2018-03-01 10:12:35 +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
DizzyEggg	988f0b7e19	Merge branch 'master' into decompile_battle_link_817C95C	2018-03-01 01:01:18 +01:00
DizzyEggg	b846015343	more battle files cleaning	2018-03-01 00:59:52 +01:00
DizzyEggg	a28dfd6da4	Merge branch 'master' into clear_battle_files	2018-02-28 23:58:29 +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
DizzyEggg	e93da9b1f9	make strings in battle message static	2018-02-28 23:50:25 +01:00
Diegoisawesome	a57e04e14d	Merge pull request #220 from PikalaxALT/trainer_rematch ... Decompile trainer_rematch	2018-02-28 16:41:54 -06:00
Diegoisawesome	0cd9ba36ce	Merge pull request #224 from DizzyEggg/another_try ... Fix two nonmatching functions	2018-02-28 13:05:05 -06:00
DizzyEggg	305a4fa744	match two functions	2018-02-28 19:37:48 +01:00
DizzyEggg	85a959f321	clean up files	2018-02-28 13:07:58 +01:00
DizzyEggg	d29b9d268f	make it compile	2018-02-28 00:18:59 +01:00
DizzyEggg	59ff4aec9b	decompile and document battle tv	2018-02-27 20:40:09 +01:00
DizzyEggg	a9212eeb66	battle file more done and clean up tv	2018-02-27 18:13:28 +01:00
KDSKardabox	835777dec2	Decompile fleff_flash rodata	2018-02-27 10:33:23 +05:30
DizzyEggg	2fa00d01ee	make it compile	2018-02-26 15:56:59 +01:00
PikalaxALT	1616f998fc	Rename some flags relevant to the conditions under which Wattson becomes available for rematch	2018-02-26 08:42:15 -05:00
DizzyEggg	1972303792	type and ability names to C	2018-02-26 14:29:17 +01:00
PikalaxALT	f46e941f30	Name functions, variables, and that one flag constant	2018-02-26 08:23:17 -05:00
DizzyEggg	919f803214	correct move target defines	2018-02-26 13:24:46 +01:00
DizzyEggg	8821d6396a	move battle moves to C	2018-02-26 12:59:52 +01:00
DizzyEggg	8ff9cb0ede	give up for now	2018-02-26 11:45:47 +01:00
PikalaxALT	80906f022b	Cleanup; create enums for trainer rematches	2018-02-25 22:33:58 -05:00
DizzyEggg	4a45b4de4e	more work	2018-02-25 18:45:00 +01:00
KDSKardabox	a3c17fad22	Decompile Fossil Special & Groundshake Data	2018-02-22 12:17:46 +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
KDSKardabox	52b631a092	Decompile more functions	2018-02-18 04:30:20 +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
golem galvanize	6cbea9af6d	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex	2018-02-15 18:20:53 -05:00
golem galvanize	4a71a61e58	start decompiling	2018-02-15 18:20:19 -05:00
Diegoisawesome	34716558b1	Almost finish decompiling intro	2018-02-15 16:54:34 -06:00
DizzyEggg	824699f505	overworld review changes2	2018-02-15 23:09:52 +01:00
KDSKardabox	a200d9406b	Finish fldeff_softboiled.c	2018-02-15 22:32:28 +05:30
KDSKardabox	301664db2f	Matching the unmatched and another function	2018-02-15 17:12:02 +05:30
DizzyEggg	90fa97f810	merge overworld with master	2018-02-15 12:41:32 +01:00
DizzyEggg	4b4495f3fe	overworld review changes	2018-02-15 12:36:52 +01:00
KDSKardabox	64683e1473	[WIP] Decompile fledd_softboiled.h	2018-02-15 15:29:26 +05:30
KDSKardabox	2fb78b5ca8	Fix reviewed points.	2018-02-15 09:47:42 +05:30
KDSKardabox	895c72cb26	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-02-15 09:45:15 +05:30
golem galvanize	c3c30417ef	fixes	2018-02-14 20:45:27 -05:00
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
KDSKardabox	ae321d6e7c	move to strings.h	2018-02-13 09:32:40 +05:30
KDSKardabox	7b360b2e33	Review fixes	2018-02-13 09:16:38 +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	f22be4d010	more overworld work	2018-02-12 18:26:26 +01: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	185cf71842	Missing label	2018-02-12 16:17:57 +05:30
KDSKardabox	d52a54e64f	Updating pokedex count function labels	2018-02-12 16:15:51 +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
golem galvanize	f2144e9932	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu	2018-02-11 20:34:56 -05: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	5e781f5b3f	change some constants to male and female	2018-02-12 00:11:10 +01:00
golem galvanize	42cfbcb197	some fixes	2018-02-11 18:00:45 -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	1a1bad3129	decompile pokemon_item_effect	2018-02-09 18:46:00 +01:00
DizzyEggg	9e7696f25a	decompile pokemon1	2018-02-09 15:55:12 +01:00
golem galvanize	56e1a52823	Fixes	2018-02-08 21:00:28 -05:00
DizzyEggg	bce01bc518	battle labels merge with master	2018-02-09 00:43:07 +01: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
DizzyEggg	9df5e16343	more battle labels	2018-02-08 12:13:29 +01:00
DizzyEggg	96290f4ee3	pokemon and battle constants	2018-02-08 11:17:41 +01:00
Diegoisawesome	772fd47564	Merge branch 'master' of https://github.com/pret/pokeemerald into menu	2018-02-07 18:06:59 -06:00
DizzyEggg	a10fd5a7c4	create more battle constants	2018-02-08 00:35:13 +01:00
DizzyEggg	caf9af321d	get rid of unnecessary externs	2018-02-08 00:00:25 +01:00
DizzyEggg	1a32010f13	iwram common symbols to c	2018-02-07 23:21:51 +01:00
DizzyEggg	5ac6cc4860	move battle vars to c file	2018-02-07 22:53:40 +01:00
DizzyEggg	4b7d778a5c	move mon data fix conflicts	2018-02-07 20:17:55 +01: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
DizzyEggg	a61dc815b0	bag arrow to item count plus 1	2018-02-07 19:51:41 +01: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	3fb2471016	Merge pull request #197 from DizzyEggg/decompile_berry_tag_screen ... Decompile berry tag screen	2018-02-07 12:27:25 -06:00
DizzyEggg	96ab6f8353	match secret base func and fix struct	2018-02-07 13:49:33 +01: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	c3dc14ba66	more renaming	2018-02-06 16:09:39 -06:00
Diegoisawesome	97c9a4ec22	Skip sub_819A080	2018-02-06 14:35:23 -06:00
camthesaxman	aba388d332	GetBattlerSpriteId -> GetAnimBattlerSpriteId	2018-02-06 14:00:01 -06:00
camthesaxman	6a4967689e	more renaming	2018-02-06 13:48:02 -06:00
camthesaxman	f78fa6aabf	rename bank to battler	2018-02-05 19:46:59 -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
DizzyEggg	0c60ffe22a	decompile title screen	2018-02-04 16:11:00 +01:00
PikalaxALT	f39053ee30	common syms in window.c, because why not	2018-02-03 10:19:56 -05: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	0826ea552e	forgot a semicolon LMAO	2018-02-02 16:09:17 +01:00
DizzyEggg	e13eacda39	decompile item icon	2018-02-02 16:06:20 +01:00
DizzyEggg	79fbee559f	add func to include	2018-02-02 14:42:29 +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