378 Commits

Author	SHA1	Message	Date
DizzyEggg	537ebd36ac	Merge contests with master	2018-08-11 19:04:28 +02:00
DizzyEggg	0e0d103044	port more of slot machine	2018-08-11 18:47:56 +02:00
Diegoisawesome	bad170b0cb	Continue decompiling field_specials	2018-08-08 23:53:21 -07:00
Diegoisawesome	90896e38c9	Begin porting/decompiling field_specials	2018-08-08 01:37:12 -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
DizzyEggg	9892298645	Merge branch 'master' into final_battle_files_touches	2018-07-07 14:11:04 +02:00
DizzyEggg	bfc64c9689	C vars sym ewram	2018-06-30 15:35:54 +02:00
DizzyEggg	3bcd30969a	cut field effect is decompiled and documented	2018-06-16 14:04:29 +02:00
Marcus Huderle	4d13e3394a	Bring all movement function names up-to-date with pokeruby	2018-06-13 17:51:26 -05:00
Marcus Huderle	aa9a45c16f	Rebrand 'map object' and 'field object' to 'event object'	2018-06-11 19:11:48 -05:00
Diegoisawesome	0b09575fd4	Merge pull request #249 from golemgalvanize/decompile_pokedex ... Decompile pokedex	2018-06-01 00:02:46 -07:00
PikalaxALT	6ae395a636	Merge branch 'master' into contest	2018-05-24 10:26:55 -04:00
DizzyEggg	4d5bfc149e	Merge branch 'master' into decomp_record_mixing	2018-05-20 12:16:45 +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	0cf3836a03	decompile menu helpers	2018-05-15 20:22:19 +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
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	c6115a2fec	through sub_8120C0C	2018-05-03 17:03:52 -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	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
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	fd40e93cb5	clear item, save and load save files	2018-04-29 14:21:59 +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	66e76d9633	Decompile script movement	2018-04-10 14:55:25 +05:30
KDSKardabox	a18dc6aa80	Decompile map_name_popup	2018-04-09 12:52:28 +05:30
Edouard Veyrier	b2e8ee836d	sub_81607EC and sub_816082C	2018-04-02 20:06:40 +02:00
KDSKardabox	8ba626b3c4	Update RAM map for fossil_specials and fldeff_groundshake	2018-03-19 17:16:44 +05:30
KDSKardabox	a24ffb1321	Finish decompiling player_pc rodata	2018-03-19 15:57:33 +05:30
KDSKardabox	e7cf8e5c17	Start decompile player_pc	2018-03-12 13:56: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	0a206ee52c	Finish decompiling intro	2018-02-15 22:30:39 -06:00
DizzyEggg	90fa97f810	merge overworld with master	2018-02-15 12:41:32 +01: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
golem galvanize	4ac064bbaf	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu	2018-02-12 14:00:47 -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
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
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
DizzyEggg	fd17ca59b0	more pokemon work	2018-02-11 17:35:01 +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
Diegoisawesome	772fd47564	Merge branch 'master' of https://github.com/pret/pokeemerald into menu	2018-02-07 18:06:59 -06: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
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	3fb2471016	Merge pull request #197 from DizzyEggg/decompile_berry_tag_screen ... Decompile berry tag screen	2018-02-07 12:27:25 -06:00
Diegoisawesome	d396a8f89c	Merge new_menu_helpers and menu	2018-02-07 00:07:42 -06:00
camthesaxman	c3dc14ba66	more renaming	2018-02-06 16:09:39 -06:00
camthesaxman	6a4967689e	more renaming	2018-02-06 13:48:02 -06:00
Diegoisawesome	06e1aca2ac	Move start_menu EWRAM symbols into C file	2018-02-05 23:12:34 -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	e6eae224fc	mon ewram data to c	2018-02-05 17:56:28 +01:00
PikalaxALT	d52f52fa73	Merge branch 'master' into link	2018-02-03 09:42:19 -05:00
DizzyEggg	e13eacda39	decompile item icon	2018-02-02 16:06:20 +01:00
DizzyEggg	b6437b8d80	document berry tag screen	2018-02-02 14:41:56 +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
DizzyEggg	db6185275e	start decompiling rayquaza scene	2018-01-31 13:05:36 +01: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
golem galvanize	4190475be5	remove symbol from EWRAM	2018-01-31 00:07:30 -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	d5d62c9d4d	fix ewram	2018-01-30 19:28:38 -05:00
DizzyEggg	741b8adf9a	decompile mystery event menu	2018-01-30 23:23:35 +01:00
golem galvanize	f0cc705d35	fixes	2018-01-30 17:16:41 -05:00
DizzyEggg	db3ecf5012	decompile scanline effect	2018-01-29 17:47:12 +01:00
Diegoisawesome	2da7bdbb11	Begin menu.s decomp	2018-01-26 23:41:52 -06:00
Diegoisawesome	cc307730a1	Add entry in sym_ewram.txt and organize a bit	2018-01-23 21:34:59 -06:00
Diegoisawesome	5a57485ece	Decompile naming_screen.c	2018-01-23 21:30:13 -06: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
DizzyEggg	f53a39e7a2	mystery event labels	2018-01-21 19:30:01 +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
scnorton	c6ff1a6ce3	Merge branch 'master' into link	2018-01-18 12:53:31 -05:00
camthesaxman	c3c13d0acf	more renaming	2018-01-16 15:12:38 -06:00
camthesaxman	157b88b6db	identity -> position	2018-01-16 14:01:31 -06:00
DizzyEggg	a6072ae293	decompile option menu	2018-01-16 18:59:06 +01:00
DizzyEggg	ba176dfe07	start working on battle transition	2018-01-01 17:41:34 +01:00
DizzyEggg	8cd4908fa3	merge bike with master, fix conflicts	2017-12-24 00:08:55 +01:00
DizzyEggg	bcffcb0c1c	pokeblock merge conflicts	2017-12-21 23:12:36 +01:00
DizzyEggg	6b5157b2a3	decompile bike.s	2017-12-21 17:46:03 +01:00
DizzyEggg	4abc2eea8a	ram vars to C files	2017-12-19 17:33:07 +01:00
DizzyEggg	cb229f56e8	fix pokeblock conflicts	2017-12-18 16:58:14 +01:00
PikalaxALT	190a2cba61	Merge branch 'master' into link	2017-12-16 11:27:10 -05:00
DizzyEggg	44abbae60b	nerge with master, fix conflicts	2017-12-16 01:08:55 +01:00
DizzyEggg	4351676749	decompile more of pokeblock.s	2017-12-16 00:08:23 +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	94da6de903	sub_800E94C	2017-12-07 00:28:12 -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	646664ff29	battle setup file is decompiled	2017-12-01 21:25:13 +01:00
DizzyEggg	e8ecb01ab2	more work on battle setup	2017-11-29 19:54:15 +01: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
Cameron Hall	6e317c6463	Merge pull request #124 from DizzyEggg/dump_battlescripts ... Dump Battle Scripts	2017-11-27 14:00:29 -06:00
DizzyEggg	b0657350a4	berry blender fix merge conflicts	2017-11-26 19:21:51 +01:00
DizzyEggg	d48392e677	change battle variables names	2017-11-26 18:07:00 +01:00
DizzyEggg	1bb5b1fd07	more battle labels	2017-11-26 17:15:28 +01:00
DizzyEggg	8c30c42c36	more labelling and changes	2017-11-26 14:17:02 +01:00
DizzyEggg	9886eeb5d8	fix, rename, label battle labels and battlescripts	2017-11-26 13:26:58 +01:00
PikalaxALT	ef18d3b8ec	Decompile asm/unk_text_util.s	2017-11-23 11:23:05 -05:00
ProjectRevoTPP	9644f44982	finish load_save.c	2017-11-22 21:06:30 -05:00
DizzyEggg	ad3a97e178	berry blender merge conflicts	2017-11-19 22:58:13 +01:00
DizzyEggg	a3b5af17ea	berry blender is done	2017-11-19 22:48:46 +01:00
PikalaxALT	d6d315d817	Merge branch 'master' into link	2017-11-19 00:07:56 -05:00
PikalaxALT	728532be77	Return stuff to its rightful place, and set up struct definitions for later	2017-11-18 20:33:53 -05:00
DizzyEggg	3de416662b	wild encounter, fix merge conflicts	2017-11-18 21:45:52 +01:00
Diegoisawesome	5dc8beb034	Merge pull request #112 from DizzyEggg/decompile_recorded_battle ... Decompile recorded battle	2017-11-18 13:29:27 -06:00
DizzyEggg	8fd3081306	start working on berry blender	2017-11-18 16:11:34 +01:00
DizzyEggg	d0245cf8d2	recorded battle merge conflicts fix	2017-11-17 19:34:55 +01:00
DizzyEggg	1b7246395d	merge conflicts, review changes, daycare	2017-11-17 19:31:03 +01:00
PikalaxALT	236cbf96c8	Merge origin/master into pikalaxalt/link	2017-11-16 19:00:07 -05:00
DizzyEggg	b37d8c0821	start decompiling wild encounter	2017-11-16 20:38:10 +01:00
DizzyEggg	1e79d53d2f	merge daycare with master	2017-11-15 17:18:05 +01:00
PikalaxALT	89b695278d	Merge branch 'master' into heal_location	2017-11-15 09:01:56 -05:00
Diegoisawesome	ce0e5cbfe4	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps	2017-11-15 00:47:34 -06:00
DizzyEggg	95949c772e	more of daycare done	2017-11-14 21:43:23 +01:00
PikalaxALT	ccf6599b40	sub_800AC34	2017-11-12 22:09:11 -05:00
DizzyEggg	3b43668286	more recorded battle done	2017-11-13 00:10:34 +01:00
DizzyEggg	c4674735d2	start working on recorded battle	2017-11-12 22:59:36 +01:00
PikalaxALT	3503444d3b	Some EWRAM offsets abstracted away	2017-11-10 20:27:02 -05:00
Diegoisawesome	2e40384fa2	Extract baseroms from event_scripts	2017-11-10 18:12:18 -06:00