1507 Commits

Author	SHA1	Message	Date
DizzyEggg	e2f5e73445	More battle dome	2018-08-15 23:04:46 +02:00
DizzyEggg	a54fa23b5f	Begin battle frontier 1	2018-08-15 15:49:50 +02:00
Diegoisawesome	6dac87abfd	Cleanup and document learn_move	2018-08-12 14:28:15 -07: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	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
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	a000eb4f36	Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move	2018-08-11 19:03:38 -07:00
Diegoisawesome	cb9127ccaf	Revert "Rename some specials" ... This reverts commit 658f9351fe.	2018-08-11 15:16:41 -07: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
DizzyEggg	7961aa44ba	start porting slot machine	2018-08-11 17:57:20 +02: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
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
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
DizzyEggg	9febcd3a0a	Document a bit of atk47	2018-07-29 15:51:08 +02:00
DizzyEggg	4080c6f831	Decompile a few pokemon summary screen functions	2018-07-28 23:26:19 +02: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
MCboy	ed3a698b98	Update field_player_avatar.s	2018-07-24 17:01:44 +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
MCboy	05c5469f61	Update field_player_avatar.s	2018-07-21 03:07:19 +04:30
MCboy	62a4193f8f	Update field_player_avatar.s	2018-07-20 03:46:55 +04:30
MCboy	34e3638f6c	decompile field_player_avatar.s	2018-07-19 21:17:27 +04:30
MCboy	9bb23388a5	Fixed a typo ... i couldnt find a function for 15 minutes because of this :(	2018-07-19 20:51:40 +04:30
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	7d375972ba	Sync bg_event macros with pokeruby	2018-07-11 11:12:26 -05:00
DizzyEggg	008d961b2a	add party menu defines	2018-07-07 19:57:09 +02: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