1906 Commits

Author	SHA1	Message	Date
Slawter666	709b63efa9	Split files	2018-08-24 21:21:19 +01:00
Slawter666	6b145ed77c	Move data from graphics.s to C	2018-08-24 04:21:07 +01:00
Diegoisawesome	96d744706d	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-08-23 02:42:45 -05:00
Diegoisawesome	26ef40553c	Move data from include to src	2018-08-23 02:32:34 -05:00
Slawter666	ed24233274	Convert more of data2b.s to C	2018-08-22 23:03:44 +01:00
Slawter666	4db5ef3ae6	Convert more data	2018-08-22 21:41:34 +01:00
Slawter666	ef6a3c2278	Move some data from data2b.s to C	2018-08-22 14:34:36 +01:00
DizzyEggg	dea1de3fed	More battle dome	2018-08-21 23:36:59 +02:00
DizzyEggg	a12b69eae1	DisplayMatchInfoOnCard decompiled	2018-08-20 22:56:05 +02:00
DizzyEggg	5da12f2b21	battle dome - more work	2018-08-19 22:26:07 +02:00
DizzyEggg	4a0f7398ec	Cant believe Ive matched this	2018-08-19 20:21:37 +02:00
DizzyEggg	239c56496b	This is impossible	2018-08-19 17:13:05 +02:00
DizzyEggg	fb19a8fc59	battle dome cards sensibly renamed	2018-08-19 01:06:10 +02:00
DizzyEggg	e4649245ba	this file is too much	2018-08-18 19:52:25 +02:00
DizzyEggg	f7fd5ce75c	Match one of the hardest battle dome functions	2018-08-18 18:23:40 +02:00
DizzyEggg	63cbc8f3cc	battle dome - a couple more functions	2018-08-18 00:54:18 +02:00
DizzyEggg	5dd1afd383	contest effect review changes	2018-08-16 22:55:36 +02:00
DizzyEggg	0bfe894566	Merge with master	2018-08-16 22:53:01 +02:00
DizzyEggg	7669a94f0d	this function is driving me insane	2018-08-16 22:46:02 +02:00
Diegoisawesome	2b81db7ace	Fix Task_Truck1	2018-08-15 19:49:17 -07:00
Diegoisawesome	13dc7a4170	Merge branch 'master' of github.com:pret/pokeemerald	2018-08-15 16:22:54 -07:00
Diegoisawesome	f65da613cf	Merge pull request #299 from DizzyEggg/contest_ai ... Decompile Contest ai	2018-08-15 16:19:18 -07:00
Diegoisawesome	e7da514382	Finish documenting and cleaning up summary_screen ... Also fix remaining nonmatchings	2018-08-15 15:58:41 -07:00
DizzyEggg	e2f5e73445	More battle dome	2018-08-15 23:04:46 +02:00
Tetrable	8896b54e8f	Add national/hoenn dex defines, update dex arrays	2018-08-15 20:10:28 +01:00
Diegoisawesome	ac3f4fd994	Continue documentation and cleanup of pokemon_summary_screen	2018-08-15 11:51:47 -07:00
DizzyEggg	a54fa23b5f	Begin battle frontier 1	2018-08-15 15:49:50 +02:00
DizzyEggg	dc6cf391ce	Make contest ai compile.	2018-08-15 12:06:23 +02:00
DizzyEggg	92c4fc6345	Contest AI clean-up	2018-08-15 11:50:18 +02:00
DizzyEggg	c806992cfc	Port contest ai from pokeruby	2018-08-15 11:43:57 +02:00
Diegoisawesome	0bc975bf57	Document and cleanup pokemon_summary_screen	2018-08-15 01:44:20 -07: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	ba225f8eaa	Fix fakematching in contest effect	2018-08-15 00:25:19 +02:00
DizzyEggg	0b22ad4ab5	make contest effect build	2018-08-15 00:01:43 +02:00
DizzyEggg	0c7063c5ba	Make contest effect table easier to edit in the future	2018-08-14 23:50:58 +02:00
DizzyEggg	c72b55a5c4	Match the worst function ever	2018-08-14 22:28:25 +02: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	b40957c09b	Finish decompiling learn_move	2018-08-12 13:33:41 -07:00
Diegoisawesome	bd2b7beb07	Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move	2018-08-12 13:17:51 -07:00
Diegoisawesome	335f4c1e81	Merge pull request #296 from DizzyEggg/event_data ... Event data	2018-08-12 13:17:36 -07:00
DizzyEggg	f1daf7442d	event data review changes	2018-08-12 22:04:49 +02:00
Diegoisawesome	9a73a47ddd	Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move	2018-08-12 12:55:21 -07:00
DizzyEggg	577e6e7c1f	Merge branch 'patch-2' of https://github.com/DizzyEggg/pokeemerald into event_data	2018-08-12 21:55:20 +02: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
Diegoisawesome	26e18f2292	Merge pull request #289 from DizzyEggg/contests ... Pikalax's contests	2018-08-12 12:04:53 -07:00
MCboy	1bc93c5a66	Merge branch 'master' into player_field_avatar	2018-08-12 23:26:00 +04:30
MCboy	2ddabca996	apply some changes	2018-08-12 22:31:58 +04:30
DizzyEggg	7dac22314e	Decompile a bit of pokemon storarage system	2018-08-12 16:40:31 +02:00
DizzyEggg	957dcd01b3	merge with master	2018-08-12 12:11:35 +02:00
DizzyEggg	e787d5b602	Contest review changes	2018-08-12 12:08:51 +02:00
DizzyEggg	1229bead2e	slot machine review changes	2018-08-12 11:50:26 +02:00
DizzyEggg	3a72e6a80d	Easy chat review changes	2018-08-12 11:39:09 +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	18d5186630	Merge remote-tracking branch 'garakmon/heal-loc-2'	2018-08-11 16:57:46 -07:00
Diegoisawesome	cf9518f237	Merge branch 'master' of github.com:pret/pokeemerald	2018-08-11 16:32:03 -07:00
Diegoisawesome	94eef0bfa5	Merge pull request #294 from DizzyEggg/learnsets ... Make learnsets easier to edit	2018-08-11 16:27:52 -07:00
Diegoisawesome	0c29447717	Merge pull request #292 from DizzyEggg/move_desc ... Move move descriptions to C	2018-08-11 16:26:16 -07:00
DizzyEggg	7b9a7765e0	Make learnsets easier to edit	2018-08-12 00:42:25 +02:00
Diegoisawesome	57b3393192	Fix compile error	2018-08-11 15:42:08 -07:00
Diegoisawesome	cb9127ccaf	Revert "Rename some specials" ... This reverts commit 658f9351fe.	2018-08-11 15:16:41 -07:00
DizzyEggg	df5009cb3e	Move move descriptions to C	2018-08-12 00:03:19 +02:00
Diegoisawesome	658f9351fe	Rename some specials	2018-08-11 14:59:43 -07:00
Diegoisawesome	b54793be91	Finish decompiling field_specials	2018-08-11 14:51:54 -07:00
DizzyEggg	7f167ca9f4	Update battle_script_commands.c	2018-08-11 23:00:16 +02:00
DizzyEggg	feee4751eb	Make event data look cleaner	2018-08-11 22:54:34 +02:00
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
DizzyEggg	7961aa44ba	start porting slot machine	2018-08-11 17:57:20 +02:00
garak	2fc3b7f171	change sUnknown_085A1E3C to sMapHealLocations	2018-08-11 10:28:13 -04:00
DizzyEggg	59d8d56868	merge easy chat with master	2018-08-11 14:14:51 +02:00
Diegoisawesome	1e0f3ec433	Continue decompiling field_specials	2018-08-10 14:07:23 -07:00
garak	c3512e3b39	port larger heal location changes from poke ruby pr	2018-08-10 10:45:15 -04:00
Diegoisawesome	12ff59f9c1	Continue decompiling field_specials	2018-08-10 00:42:06 -07:00
Slawter666	bc42c5054c	Merge remaining overworld frames	2018-08-10 00:20:19 +01:00
Slawter666	877a80d3bc	Merge berry tree frames	2018-08-09 23:19:45 +01:00
Diegoisawesome	bad170b0cb	Continue decompiling field_specials	2018-08-08 23:53:21 -07:00
Slawter666	dea0bba64e	Merge "pokemon" frames	2018-08-09 00:55:32 +01:00
Diegoisawesome	90896e38c9	Begin porting/decompiling field_specials	2018-08-08 01:37:12 -07:00
garak	45b730e474	copy heal_location changes from pokeruby	2018-08-07 23:05:48 -04:00
Slawter666	704e3c7334	Merge https://github.com/pret/pokeemerald into spritesheet	2018-08-07 22:18:30 +01:00
Slawter666	ab2cc59629	Merge remaining "people" overworld frames	2018-08-07 22:16:03 +01:00
Diegoisawesome	85ebd76cd0	Fix fanfare constant to use define	2018-08-04 18:41:53 -07:00
DizzyEggg	eb4d9f6fed	Tabs to spaces	2018-08-03 00:24:10 +02:00
DizzyEggg	d6537c811b	Battle code enums in case switches	2018-08-03 00:13:44 +02:00
Diegoisawesome	759bc2671c	Merge pull request #280 from DizzyEggg/decompile_part_mon_summary ... Decompile a few pokemon summary screen functions	2018-08-02 08:27:05 -07:00
Slawter666	5917f7d108	Merge frontier brains, team magma and team aqua frames	2018-08-02 00:34:28 +01:00
Slawter666	52aa9cedcf	Merge May frames into sprite sheets ... Plus fix Brendan's surfing and watering frame order.	2018-07-29 17:29:36 +01:00
DizzyEggg	9febcd3a0a	Document a bit of atk47	2018-07-29 15:51:08 +02:00
DizzyEggg	68145cd002	Document atk48	2018-07-29 15:33:16 +02:00
DizzyEggg	4080c6f831	Decompile a few pokemon summary screen functions	2018-07-28 23:26:19 +02:00
Slawter666	d5825230e5	Merge "brendan" frames into sprite sheets	2018-07-28 18:11:28 +01:00
MCboy	6c365fdc94	Update field_player_avatar.c	2018-07-25 17:47:04 +04:30
MCboy	3a15012085	Update field_player_avatar.c	2018-07-25 17:28:25 +04:30
MCboy	94a5f8d529	made file better ?	2018-07-25 17:18:49 +04:30
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	82d88479ce	decompiled a bunch of functions ... i also made TryInterruptEventObjectSpecialAnim functionally equivalent tho its still nonmatching so i need help with that	2018-07-24 16:59:52 +04:30
DizzyEggg	1e9143e0b2	merge union room with master	2018-07-22 13:14:58 +02:00
DizzyEggg	c9d486a5d3	make union room compile i guess	2018-07-22 12:49:49 +02:00
vblm12	29276cc76c	Move some trainer data from data2b.s to c structs.	2018-07-20 22:14:31 -05:00
MCboy	201fb6f818	ported code over from pokeruby	2018-07-21 03:06:40 +04:30
MCboy	43fa9da52a	decompile more code ... 1 non matching need help	2018-07-20 03:44:20 +04:30
MCboy	416db8e751	oops	2018-07-19 21:23:45 +04:30
MCboy	a8f9adeaf5	decompile player_field_avatar	2018-07-19 21:22:35 +04:30
MCboy	e3a82bd2c5	decompile player_field_avatar.s	2018-07-19 21:18:09 +04:30
DizzyEggg	118fa3afce	IS_MOVE_PHYSICAL to IS_TYPE_PHYSIAL	2018-07-16 22:00:27 +02:00
DizzyEggg	bf0178238a	Battle files - review changes	2018-07-16 20:47:30 +02:00
DizzyEggg	ea5ffa3375	Merge with master	2018-07-16 20:23:05 +02:00
Diegoisawesome	07ef762770	Merge pull request #275 from Diegoisawesome/master ... Document list_menu.c and main_menu.c	2018-07-15 04:43:03 -07:00
Diegoisawesome	731d6d59bc	Document list_menu.c and main_menu.c	2018-07-15 04:30:37 -07:00
Marcus Huderle	546819bc72	Use map type constants in map headers	2018-07-12 22:39:38 -05:00
Marcus Huderle	7d375972ba	Sync bg_event macros with pokeruby	2018-07-11 11:12:26 -05:00
Marcus Huderle	d675b7578c	Move movement type constants into include/constants/event_object_movement_constants.h	2018-07-10 18:04:41 -05:00
Slawter666	08774bdd88	Merge https://github.com/pret/pokeemerald into pokedex-doc	2018-07-08 01:23:28 +01:00
Slawter666	dd228fae5a	Minor variable labelling	2018-07-08 01:20:01 +01:00
DizzyEggg	ee3d505b58	little touches for HandleTurnActionSelectionState	2018-07-07 21:14:41 +02:00
DizzyEggg	008d961b2a	add party menu defines	2018-07-07 19:57:09 +02:00
DizzyEggg	1c48e58574	small fixes	2018-07-07 14:24:19 +02:00
DizzyEggg	9892298645	Merge branch 'master' into final_battle_files_touches	2018-07-07 14:11:04 +02:00
Diegoisawesome	f79ac26ce3	Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer	2018-07-05 20:33:07 -07:00
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	e6d67c7c22	give labels to player controller functions	2018-07-01 15:45:47 +02:00
DizzyEggg	c556358e47	label multiuse sprite template functions	2018-07-01 15:28:57 +02:00
DizzyEggg	f35c0abe80	merge with battle tent update	2018-07-01 12:16:52 +02:00
DizzyEggg	d2e47323fe	document frontier related	2018-07-01 11:15:42 +02:00
DizzyEggg	2d0be91217	Move all trainer defines to trainers.h and identify frontier brain trainer id	2018-06-30 18:55:34 +02:00
DizzyEggg	bfc64c9689	C vars sym ewram	2018-06-30 15:35:54 +02:00
DizzyEggg	97712ec931	change mapDataId to mapLayoutId	2018-06-30 14:52:13 +02:00
DizzyEggg	15fe5a031b	Merge branch 'master' into decompile_battle_tent	2018-06-30 14:43:41 +02:00
DizzyEggg	cdacc27714	change for loop in fldeff_cut	2018-06-30 14:26:33 +02:00
DizzyEggg	5434db2fc6	use region map constants	2018-06-30 14:22:09 +02:00
DizzyEggg	30c85a5128	more battle documentation	2018-06-30 14:12:17 +02:00
DizzyEggg	272b98da6c	document party status summary	2018-06-28 21:06:32 +02:00
Marcus Huderle	5e00c0bfcf	Fix map constants	2018-06-20 19:54:21 -05:00
Marcus Huderle	ed8b006e67	Rename map-layout-related things	2018-06-20 19:54:21 -05:00
DizzyEggg	ab36efdaf4	document bounce effect	2018-06-20 23:07:51 +02:00
DizzyEggg	94752d4207	document battle bars	2018-06-19 00:43:15 +02:00
DizzyEggg	caa36b530a	label and document battle windows	2018-06-17 16:48:58 +02:00
DizzyEggg	9329ffc2bc	review cut changes	2018-06-17 12:39:58 +02: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
DizzyEggg	7ea5dd7923	start fldeffect cut	2018-06-16 00:45:48 +02:00
Marcus Huderle	acc1a5d446	Get all map constants from include/ rather than constants/	2018-06-15 07:49:21 -05:00
Marcus Huderle	0c8cfc2297	Merge pull request #264 from Mother-Of-Dragons/master ... tileset_anims.c typo fix	2018-06-14 09:10:50 -05:00
Avara	7a9c9bee85	tileset_anims.c typo fix	2018-06-14 14:34:19 +01:00
Marcus Huderle	bebcea4029	Merge pull request #263 from huderlem/event_object_movement ... Sync event object movement with pokeruby	2018-06-14 08:08:51 -05: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
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
Avara	3bed36276d	updated label names	2018-06-11 21:57:22 +01:00
Avara	7de91ed6ae	updated label names	2018-06-11 21:22:41 +01: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	4018acfae1	Update event object struct members	2018-06-11 09:19:17 -05:00
Marcus Huderle	38a126df66	Rename field_map_obj to event_object_movement	2018-06-11 08:46:33 -05:00
DizzyEggg	5526d980ec	union room is too hard	2018-06-10 18:28:37 +02:00
DizzyEggg	166295acc7	union room prepare for battle	2018-06-09 22:14:52 +02:00
DizzyEggg	7b72cfdc6c	through sub_80156C8	2018-06-04 23:32:28 +02:00
DizzyEggg	dbb9cdd424	more link stuff	2018-06-04 12:07:32 +02:00
DizzyEggg	e50f4b4999	still going	2018-06-03 22:39:10 +02:00
DizzyEggg	e95b1156d2	more progress	2018-06-03 09:37:01 +02:00
DizzyEggg	83cf2f50df	shabby beginnings	2018-06-01 23:08:25 +02:00
Diegoisawesome	0b09575fd4	Merge pull request #249 from golemgalvanize/decompile_pokedex ... Decompile pokedex	2018-06-01 00:02:46 -07:00
golem galvanize	94030c6b53	fixed as best I could	2018-05-31 07:08:24 -04: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	42731e4b88	LANG_ENG to GAME_LANGUAGE	2018-05-30 20:28:31 +02:00
DizzyEggg	ff0c615870	decompile rom_8034C54	2018-05-27 23:26:01 +02:00
DizzyEggg	357afd91b5	start rom_8034C54 decomp	2018-05-27 17:42:48 +02:00
DizzyEggg	dd1c7c741a	make record mixing compile	2018-05-26 00:37:03 +02:00
DizzyEggg	9e7965fab0	document record mixing	2018-05-26 00:25:36 +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
DizzyEggg	03b593d3c3	try my luck with record mixing	2018-05-22 21:54:57 +02:00
DizzyEggg	c8e1c80375	record mixing fix for real hopefully	2018-05-20 12:21:39 +02:00
DizzyEggg	4d5bfc149e	Merge branch 'master' into decomp_record_mixing	2018-05-20 12:16:45 +02:00
DizzyEggg	1a8d5132d6	fix record mixing for real	2018-05-20 10:51:09 +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	1307fde8ca	make field tasks compile	2018-05-19 18:13:48 +02:00
DizzyEggg	d1798d0ed9	decompile field tasks	2018-05-19 18:02:43 +02:00
DizzyEggg	11d8f489c4	failed attempt	2018-05-19 14:30:41 +02:00
DizzyEggg	e44f35c7b7	fix record mixing merge conflicts	2018-05-19 12:32:44 +02:00
DizzyEggg	9385036ff7	make menu indicators compile	2018-05-19 11:53:22 +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
Diegoisawesome	23b050a99e	Update naked attribute and ASM_DIRECT to NAKED macro	2018-05-11 17:24:32 -05:00
PikalaxALT	5539e282a3	through sub_80DB798	2018-05-11 10:51:38 -04:00
PikalaxALT	8d0da7d8e0	Propagate ASM_DIRECT --> NAKED renaming	2018-05-11 09:41:32 -04:00
PikalaxALT	4488bbe9e6	Merge branch 'master' into contest	2018-05-11 09:25:26 -04:00