1418 Commits

Author	SHA1	Message	Date
DizzyEggg	d5abd7b696	Document Battle Pie	2018-11-12 14:36:31 +01:00
DizzyEggg	a4235c9ff8	Document battle arena	2018-11-11 18:33:16 +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	7dd4ed7060	r5/r6 swap on sub_80E2578	2018-11-05 14:45:54 -06:00
DizzyEggg	0bb51037d7	Finish frontier util	2018-11-01 21:31:10 +01:00
DizzyEggg	90ef269426	Merge branch 'master' into battle_frontier_2	2018-10-30 21:48:18 +01:00
DizzyEggg	0da7d7e6ae	why is this function so hard to match	2018-10-30 21:45:26 +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
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	98d8dbfd8a	Up to sub_81a443c	2018-10-28 00:50:06 +02:00
DizzyEggg	0e6fbbfe09	Make battle tower compile	2018-10-27 00:04:18 +02:00
DizzyEggg	52be8eeaf1	Merge branch 'master' into battle_tower	2018-10-26 23:55:36 +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	2f4b00e34b	finish effects_1 data	2018-10-23 12:17:31 -04:00
garak	68814c42de	begin 80FE840 data	2018-10-23 08:25:51 -04:00
DizzyEggg	b330bdba51	More and more battle tower	2018-10-22 19:22:57 +02:00
garak	6cf39e8a6e	clean up sprite tags	2018-10-22 10:51:40 -04:00
garak	d267fcbfb1	name remaining tags	2018-10-22 10:36:43 -04:00
garak	2b9fd18dd4	battle_anims.s data to C	2018-10-21 22:30:20 -04:00
garak	f2363f5982	more tag names	2018-10-21 19:30:27 -04:00
garak	7a9c7e5f06	Merge branch 'master' into sprite-tags	2018-10-21 15:12:18 -04:00
garak	2bb286ab4e	begin ANIM_TAG port	2018-10-21 15:07:10 -04:00
DizzyEggg	0ab27e44b1	more tower, fail	2018-10-21 20:13:12 +02:00
Slawter666	3d8874d919	Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise	2018-10-21 00:20:09 +01:00
DizzyEggg	16026fe91d	More battle tower.	2018-10-21 00:06:42 +02:00
Diegoisawesome	2a3ba78831	Merge pull request #369 from garakmon/pan-constants ... Use sound pan constants in data/battle_anim_scripts.s	2018-10-19 20:27:54 -05:00
garak	ecd482fa2c	fix merge conflicts in battle_anim_scripts	2018-10-19 16:19:36 -04:00
garak	38fcc46abb	Merge remote-tracking branch 'upstream/master' into pan-constants	2018-10-19 16:05:14 -04:00
garak	901f3ff557	use sound panning constants in battle_anim_scripts	2018-10-19 15:57:19 -04:00
Diegoisawesome	bf8fa23462	Merge pull request #365 from garakmon/event-flags ... [WIP] Event flags	2018-10-19 14:24:34 -05:00
garak	113a8d1efd	clean flags and remove temp macro	2018-10-19 14:59:18 -04:00
garak	1441ee6bc3	finish event object flags	2018-10-19 13:04:47 -04:00
garak	cb5981cdf2	name more event flags	2018-10-18 21:32:21 -04:00
garak	c27043bd3c	more event flags	2018-10-18 15:28:59 -04:00
Diegoisawesome	6206acd2d2	Finish shop and fldeff_escalator	2018-10-18 12:05:02 -05:00
garak	d1b7f32b0a	begin event flag names, add temporary hidden item macro	2018-10-17 22:07:23 -04:00
garak	7d88b9647f	Merge branch 'master' into event-flags	2018-10-17 12:30:45 -04:00
garak	ff97873c30	label temp flags, test replace script	2018-10-17 12:25:12 -04:00
garak	624a7552b6	use event flags in event scripts	2018-10-17 09:05:22 -04:00
Diegoisawesome	e75f0b4f80	Port/decompile field_control_avatar	2018-10-16 21:47:08 -05:00
Slawter666	1435c96b41	Further synchronisation	2018-10-17 01:11:44 +01:00
Deokishisu	b52b05368c	Fix "Vigaroth" misspelling in May's House 1F	2018-10-16 12:08:17 -04:00
Deokishisu	e377c323c4	Fix "Vigaroth" misspelling in Brendan's House 1F	2018-10-16 12:07:47 -04:00
Diegoisawesome	a9abb930aa	Merge pull request #352 from huderlem/shop ... [WIP] Shop	2018-10-14 19:03:48 -05:00
Diegoisawesome	7f211b2588	Merge pull request #359 from Slawter666/label_field_effect_helpers ... Label field_effect_helpers.c	2018-10-14 18:37:11 -05:00
Deokishisu	bf2063cc1a	Update All EVENT_OBJ_GFX References ... Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.	2018-10-14 19:09:18 -04:00
Slawter666	137f6549ff	label field_effect_helpers	2018-10-14 23:43:40 +01: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
DizzyEggg	f47ed3268c	Finish documenting apprentice for now	2018-10-14 17:00:41 +02:00
DizzyEggg	d60e4e23f8	Merge pull request #25 from Slawter666/apprentice-data ... Move apprentice data to C	2018-10-14 16:28:27 +02:00
DizzyEggg	7952cfeba5	document more of apprentice	2018-10-14 16:27:48 +02: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	145df49063	Document more of apprentice	2018-10-14 14:35:51 +02:00
DizzyEggg	b4a42a6832	Decompile apprentice	2018-10-14 11:37:44 +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	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
Marcus Huderle	b9e38a569e	Merge pull request #320 from DizzyEggg/anims ... Document battle animation scripts	2018-10-06 08:20:41 -05:00
DizzyEggg	17c5b4089a	Label most of the anim tags	2018-10-06 09:37:52 +02:00
Tetrable	e80a53060b	Start anim tags	2018-10-05 23:00:07 +01:00
DizzyEggg	611360c29e	calledattack to calledmove	2018-09-22 19:08:41 +02:00
DizzyEggg	e362c06aea	gRandomMove to gCalledMove	2018-09-22 18:41:00 +02:00
DizzyEggg	66fd9b2ddf	Label trainer hill battle type	2018-09-20 22:00:00 +02:00
Marcus Huderle	f2a76b54bd	Re-dump tileset images as RGB-indexed, rather than greyscale	2018-09-16 11:07:48 -05:00
DizzyEggg	4d2637883a	Slot machine is decompiled.	2018-09-15 23:19:37 +02:00
DizzyEggg	db248dada2	slot machine is decompiled	2018-09-15 22:59:45 +02:00
DizzyEggg	0547e260a4	More of slot machine	2018-09-15 18:01:20 +02:00
DizzyEggg	2a7811456a	Add anim tag sprite defines	2018-09-15 00:30:20 +02:00
DizzyEggg	a08d9dd451	Merge branch 'master' into anims	2018-09-12 22:59:04 +02:00
DizzyEggg	8a81bd1bce	Sync battle anim labels with pokeruby	2018-09-12 22:58:03 +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	10b479a3ca	Document battle animation scripts.	2018-09-10 21:19:19 +02:00
DizzyEggg	b87856b58e	Battle Factory is decompiled and documented.	2018-09-10 01:01:39 +02:00
Slawter666	135e98a824	Move battle factory data to C	2018-09-09 16:06:35 +01: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
DizzyEggg	6454740587	More battle factory	2018-09-09 13:12:26 +02:00
Diegoisawesome	cf8f73bde1	Merge pull request #314 from Slawter666/data ... Convert data to C	2018-09-07 11:39:07 -05:00
Marcus Huderle	fa9d1759bd	checkpoint	2018-09-06 11:37:45 -05:00
Slawter666	9ad7dc9fd7	Move remaining field_player_avatar data across	2018-09-06 12:02:37 +01:00
Slawter666	26c91f1502	Move field_player_avatar data to C	2018-09-06 03:11:33 +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	44ba432dad	Label various battle scripts	2018-09-01 20:00:13 +02:00
DizzyEggg	ead21250a6	Label all battle ai scripts	2018-09-01 19:05:06 +02:00
DizzyEggg	917b32ffbe	Finish decompiling pyramid bag.	2018-08-30 20:10:57 +02:00
Diegoisawesome	8e5c72766c	Merge pull request #300 from DizzyEggg/decompile_battle_frontier_1 ... Decompile battle_dome	2018-08-29 14:13:39 -05:00
Slawter666	e30c2251ce	Convert more of data2b	2018-08-27 00:26:54 +01:00
DizzyEggg	ddd4733de3	rename battle pyramid to battle pyramid bag	2018-08-26 17:54:58 +02:00
Slawter666	69c20f18ac	Convert battle dome data to C	2018-08-26 13:40:36 +01:00
DizzyEggg	2b7c138cbe	Some labels	2018-08-25 21:04:12 +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	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	5da12f2b21	battle dome - more work	2018-08-19 22:26:07 +02:00
DizzyEggg	e4649245ba	this file is too much	2018-08-18 19:52:25 +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
Diegoisawesome	ac3f4fd994	Continue documentation and cleanup of pokemon_summary_screen	2018-08-15 11:51:47 -07: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
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	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
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
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	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	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	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
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
DizzyEggg	3d5f512aec	Use constant in a battle script.	2018-08-03 18:07:45 +02: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
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	1b3d7a5bef	Update field_player_avatar.s	2018-07-24 17:04:02 +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	3d04105488	Remove unnecessary files.	2018-07-21 01:51:44 -05:00
vblm12	29276cc76c	Move some trainer data from data2b.s to c structs.	2018-07-20 22:14:31 -05: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	94650495c6	Use map battle scene constants in map headers	2018-07-12 22:45:41 -05:00
Marcus Huderle	546819bc72	Use map type constants in map headers	2018-07-12 22:39:38 -05:00
Marcus Huderle	d53e8137cd	Use weather constants in map headers	2018-07-12 22:15:35 -05:00
Marcus Huderle	d5eb94330a	Use region map section constants in map headers	2018-07-12 21:47:04 -05:00
Marcus Huderle	7d375972ba	Sync bg_event macros with pokeruby	2018-07-11 11:12:26 -05:00
Marcus Huderle	8ffd7a70fc	Use movement type constants in object_event macros	2018-07-10 18:04:51 -05:00
DizzyEggg	9892298645	Merge branch 'master' into final_battle_files_touches	2018-07-07 14:11:04 +02: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	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	15fe5a031b	Merge branch 'master' into decompile_battle_tent	2018-06-30 14:43:41 +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	91ee3221b3	Formatting	2018-06-20 19:54:21 -05: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
Marcus Huderle	135a11e50e	Move events and scripts into map dirs	2018-06-20 19:54:21 -05:00
Marcus Huderle	89d35e82a2	Move 'map attributes' into 'layouts'	2018-06-20 19:54:21 -05:00
DizzyEggg	caa36b530a	label and document battle windows	2018-06-17 16:48: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
Marcus Huderle	f807eb1f2d	Split out movement radius in object_event macro	2018-06-15 07:49:21 -05:00
Marcus Huderle	2807abe3ba	Remove filler bytes from object_event macro	2018-06-15 07:49:21 -05:00
Marcus Huderle	acc1a5d446	Get all map constants from include/ rather than constants/	2018-06-15 07:49:21 -05: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	e01dd90bb3	Update applymovement actions to reflect movement action names	2018-06-13 18:19:19 -05:00
Marcus Huderle	4d13e3394a	Bring all movement function names up-to-date with pokeruby	2018-06-13 17:51:26 -05:00
Avara	223ee357f7	battle dome palette label update to graphics.s	2018-06-12 12:12:29 +01: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	e95b1156d2	more progress	2018-06-03 09:37:01 +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	de60bdf2fe	Merge pull request #256 from DizzyEggg/decompile_field_tasks ... Decompile field tasks	2018-05-19 23:34:30 -05:00
DizzyEggg	0978cc60a1	change map event var names to pokeruby ones	2018-05-19 19:20:32 +02: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	1ead30ad40	decompile menu indicators	2018-05-19 10:54:02 +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
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
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	5efe8f3a0d	through sub_80DAB8C	2018-05-08 19:00:23 -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
Slawter666	279a6e1ddc	Convert item_icon_table.inc to C	2018-05-06 13:37:28 +01:00
Slawter666	aab1238ec0	Revert "Convert item_graphics.inc to C" ... This reverts commit 546217d281.	2018-05-06 09:12:23 +01:00
Slawter666	546217d281	Convert item_graphics.inc to C ... I have tried to group the items that share the same icon but have different palettes where possible. This commit also splits data/graphics.s into two files.	2018-05-05 23:27:26 +01:00
Slawter666	22ec43a6ed	resolve merge conflicts	2018-05-05 18:50:26 +01:00
PikalaxALT	58200616d5	Merge branch 'master' into trader	2018-05-04 17:45:50 -04:00
PikalaxALT	8aa462cd74	through sub_8121178	2018-05-03 18:05:07 -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	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	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	f9a2f6c4a2	start decompiling battle records	2018-05-01 12:38:55 +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	a04f8f6ee3	Convert item data files to .c (not compiling)	2018-04-23 21:44:46 +01:00
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	936bb5925a	Decompile dewford trend	2018-04-16 16:22:13 +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
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
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	57775a946d	Rename start menu functions	2018-03-28 21:09:27 +02:00
Anders Løvig	5bc8ee6465	Added static modifers	2018-03-28 15:45:35 +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
Diegoisawesome	2ecbe252a2	Merge pull request #219 from Mother-Of-Dragons/master ... Fixed label names: battle_ai_scripts.s	2018-03-14 17:47:46 -05:00
Avara	e03004b4b6	Fixed label names: battle_ai_scripts.s	2018-03-13 11:55:18 +00:00
KDSKardabox	f3b5ed0d12	Decompile more functions & rename some labels	2018-03-13 14:41:39 +05:30
KDSKardabox	e7cf8e5c17	Start decompile player_pc	2018-03-12 13:56:20 +05:30
PikalaxALT	aa2cb6a974	Rename match call assets	2018-03-06 08:52:29 -05:00
PikalaxALT	7b9930a0a2	Remaining data in match_call	2018-03-04 16:58:51 -05:00
PikalaxALT	1c67840652	Match call data, 2	2018-03-04 16:44:50 -05:00
PikalaxALT	9b25d02369	Match call data, 1	2018-03-04 16:14:56 -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
PikalaxALT	df128cbfed	Merge branch 'master' into pokenav_match_call	2018-03-02 21:49:09 -05:00
PikalaxALT	89847427e4	match_call_t; through sub_81D17E4	2018-03-02 08:44:33 -05: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
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	59ff4aec9b	decompile and document battle tv	2018-02-27 20:40:09 +01:00
KDSKardabox	835777dec2	Decompile fleff_flash rodata	2018-02-27 10:33:23 +05:30
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	8821d6396a	move battle moves to C	2018-02-26 12:59:52 +01:00
PikalaxALT	6bfc8579ad	Decompile trainer_rematch	2018-02-25 21:56:09 -05:00
KDSKardabox	a3c17fad22	Decompile Fossil Special & Groundshake Data	2018-02-22 12:17:46 +05:30
Avara	59c95c32db	Fixed label names: battle_ai_scripts.s	2018-02-21 00:26:12 +00:00
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
KDSKardabox	ffeca135bc	Merge branch 'master' of https://github.com/pret/pokeemerald	2018-02-16 09:29:11 +05:30
Diegoisawesome	34716558b1	Almost finish decompiling intro	2018-02-15 16:54:34 -06:00
DizzyEggg	90fa97f810	merge overworld with master	2018-02-15 12:41:32 +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
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	aaea65c37b	Merge branch 'master' of https://github.com/pret/pokeemerald ... # Conflicts: # include/strings.h	2018-02-13 10:02:27 +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	0ca0ad1c63	Decompile birch_pc.c	2018-02-12 15:42:15 +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
PikalaxALT	ea347199a2	Merge branch 'master' into link	2018-02-11 19:22:06 -05:00
DizzyEggg	0347509704	make it compile o	2018-02-12 00:31:13 +01: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	9e7696f25a	decompile pokemon1	2018-02-09 15:55:12 +01: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	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	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
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	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
camthesaxman	6a4967689e	more renaming	2018-02-06 13:48:02 -06:00
camthesaxman	3ec68d5f79	reorganize berry graphics files	2018-02-06 11:51:43 -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	e6eae224fc	mon ewram data to c	2018-02-05 17:56:28 +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	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	e13eacda39	decompile item icon	2018-02-02 16:06:20 +01:00
DizzyEggg	14d2caaf8d	start decompiling berry tag screen	2018-02-02 12:32:12 +01:00
ProjectRevoTPP	78bd2b0849	move save rodata to source and use saveblock chunk macros	2018-01-31 15:26:57 -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
DizzyEggg	9fbedcc41c	coord weather fix conflicts	2018-01-31 00:02:16 +01:00
DizzyEggg	741b8adf9a	decompile mystery event menu	2018-01-30 23:23:35 +01:00
Diegoisawesome	6873f47821	Merge pull request #190 from DizzyEggg/decompile_time_events ... decompile time events	2018-01-30 15:20:24 -06:00
DizzyEggg	e6fb626c1f	decompile_coord_event_weather	2018-01-29 16:46:56 +01:00
DizzyEggg	d728124a7b	decompile time events	2018-01-29 15:55:34 +01:00
DizzyEggg	78fc471f32	mon anim with master	2018-01-29 14:40:50 +01:00
DizzyEggg	78728ae454	add rgb constants	2018-01-29 14:36:13 +01:00
DizzyEggg	ed546d680f	pokemon animation is decompiled	2018-01-29 12:36:56 +01:00
DizzyEggg	16c46905ff	more pokemon animation functions	2018-01-28 00:51:20 +01:00
DizzyEggg	95827ab64b	more pokemon anim functions decompiled	2018-01-27 11:57:46 +01:00
Diegoisawesome	2da7bdbb11	Begin menu.s decomp	2018-01-26 23:41:52 -06:00
Diegoisawesome	0c47cd6fc3	Renamed link_strings and fixed warning in fldeff_cut.s	2018-01-24 00:18:10 -06:00
Diegoisawesome	5784098446	Organization and naming	2018-01-23 23:14:22 -06:00
Diegoisawesome	5a57485ece	Decompile naming_screen.c	2018-01-23 21:30:13 -06:00
DizzyEggg	ad73f92061	start decompiling pokemon animation	2018-01-22 21:32:50 +01: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
Diegoisawesome	2ba141eac4	Merge pull request #182 from DizzyEggg/decompile_hof_pc ... decompile hof pc	2018-01-21 15:10:26 -06:00
DizzyEggg	f59eedb672	decompile hof pc	2018-01-21 20:45:43 +01:00
DizzyEggg	f53a39e7a2	mystery event labels	2018-01-21 19:30:01 +01:00
DizzyEggg	e0fbd5daad	text window cleanup	2018-01-21 13:32:11 +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
Diegoisawesome	c5b3c4168a	Remove attempt at guarding specials.inc	2018-01-21 03:30:31 -06:00
golem galvanize	4499af0ec3	got another pointer	2018-01-20 23:36:17 -05:00
golem galvanize	452c0cfd7c	BEGONE POINTER	2018-01-20 23:18:26 -05:00
golem galvanize	bce63b3694	REMOVE BASEROM	2018-01-20 22:41:02 -05:00
PikalaxALT	772f0aa3fd	Merge branch 'master' into link	2018-01-20 22:08:41 -05:00
golem galvanize	f22d295cfc	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms	2018-01-20 21:37:47 -05:00
Diegoisawesome	d279f50f57	Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald	2018-01-20 19:18:33 -06:00
Diegoisawesome	28c9f40b3e	Extract data from fossil_special_fldeff_groundshake	2018-01-20 19:18:03 -06:00
golem galvanize	33ebcabc3a	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms	2018-01-20 19:45:38 -05:00
golem galvanize	bdc8cf6ac4	fixing conflicts	2018-01-20 19:44:34 -05:00
Diegoisawesome	f00bbdfeca	Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald	2018-01-20 18:31:07 -06:00
Diegoisawesome	8d7a830151	Extract data from field_effect_misc	2018-01-20 18:30:33 -06:00
Diegoisawesome	064c813a95	Extract data from map_obj_8097404	2018-01-20 17:45:45 -06:00
Diegoisawesome	ed8269889b	Extract data from pokedex.s	2018-01-20 17:17:51 -06:00
golem galvanize	59e1aacd26	DIEGO SEND HELP	2018-01-20 17:26:30 -05:00
Diegoisawesome	aca539d5dd	Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald	2018-01-20 16:22:40 -06:00
Diegoisawesome	b47b9e5758	Extract data from starter_choose	2018-01-20 16:22:16 -06:00
Diegoisawesome	692ed13fe7	Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald	2018-01-20 15:37:56 -06:00
Diegoisawesome	d10c91f1b0	Extract data from item_menu_icons.s	2018-01-20 15:37:37 -06:00
golem galvanize	646aa19e87	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms	2018-01-20 15:56:36 -05:00
Diegoisawesome	82c6df71b6	Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald	2018-01-20 14:20:34 -06:00
Diegoisawesome	971b47755d	Extract data from naming screen	2018-01-20 14:16:01 -06:00
Diegoisawesome	80e376d6cb	Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald	2018-01-20 02:38:11 -06:00
Diegoisawesome	2ef7467951	Extract data from pokemon_summary_screen	2018-01-20 02:37:28 -06:00
golem galvanize	4729338e5b	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms	2018-01-20 03:07:04 -05:00
Diegoisawesome	4cb2853344	Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald	2018-01-20 00:49:43 -06:00
Diegoisawesome	098671750b	Extract data from text window	2018-01-20 00:49:21 -06:00
Diegoisawesome	ce3ab413ba	Merge remote-tracking branch 'Diego/dump_data'	2018-01-19 23:43:05 -06:00
Diegoisawesome	7abfc6a989	Extract data from trainer card	2018-01-19 23:42:30 -06:00
Diegoisawesome	73082f2855	Merge remote-tracking branch 'Diego/dump_data'	2018-01-19 21:39:23 -06:00
Diegoisawesome	fbb51bc24b	Extract baseroms from party_menu.s	2018-01-19 21:38:57 -06:00
Diegoisawesome	2d74179d86	Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald	2018-01-19 20:08:30 -06:00
Diegoisawesome	4be109e60e	Extract forgotten baserom in trade.s	2018-01-19 20:07:59 -06:00
golem galvanize	59b5957ebe	Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms	2018-01-19 21:05:13 -05:00
golem galvanize	e5ba5ccdbb	dump battle_frontier_2.s	2018-01-19 21:04:43 -05:00
golem galvanize	c45db79b5d	dump contest.s	2018-01-19 21:03:17 -05:00
Diegoisawesome	4559a95d9b	Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald	2018-01-19 19:54:19 -06:00
Diegoisawesome	b22a800581	Extract data from trade.s ... Also rename window_template_terminator to null_window_template, in keeping with naming conventions	2018-01-19 19:52:46 -06:00
Diegoisawesome	c74334c26a	Fix address of berry struct in item.c	2018-01-19 12:49:08 -06:00