3064 Commits

Author	SHA1	Message	Date
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
Slawter666	7a072d4527	Continue synchronising	2018-10-20 21:01:45 +01: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
DizzyEggg	f4e55999a5	begin porting and decomping battle tower	2018-10-20 00:33:51 +02: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
Diegoisawesome	95d8815721	Merge pull request #368 from Diegoisawesome/master ... Finish porting/decompiling field_player_avatar	2018-10-19 00:08:59 -05:00
Diegoisawesome	dd3689fdbf	Finish porting/decompiling field_player_avatar	2018-10-19 00:05:54 -05: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
DizzyEggg	dfee5deca8	Move Bitmap struct and clear sprite/text files	2018-10-18 21:24:37 +02:00
Diegoisawesome	6206acd2d2	Finish shop and fldeff_escalator	2018-10-18 12:05:02 -05:00
golem galvanize	dded980cde	fix building	2018-10-17 23:36:18 -04:00
garak	d1b7f32b0a	begin event flag names, add temporary hidden item macro	2018-10-17 22:07:23 -04:00
golem galvanize	2c6d634acd	Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu	2018-10-17 20:03:31 -04:00
golem galvanize	65a0c48eec	decompiled some more of the file	2018-10-17 20:03:02 -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
Slawter666	b7b1d609d0	More synchronisation	2018-10-17 13:52:26 +01: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
DizzyEggg	d3215ff96f	Fix wild double battle issues	2018-10-16 22:19:53 +02:00
Deokishisu	78a912a039	Fix "Vigaroth" misspelling to "Vigoroth"	2018-10-16 12:06:38 -04:00
Slawter666	3aff112127	Begin synchronising with pokeruby	2018-10-16 14:55:16 +01:00
DizzyEggg	67384c08be	Implement double wild battle functionality	2018-10-15 21:19:52 +02: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
DizzyEggg	ef11706dc7	Begin wild double battles	2018-10-14 22:37:07 +02:00
DizzyEggg	b3ad32bbe6	Merge with master	2018-10-14 20:51:34 +02:00
Diegoisawesome	02049d52ee	Merge pull request #351 from DizzyEggg/apprentice ... Decompile apprentice	2018-10-14 13:20:38 -05:00
Diegoisawesome	43316ffae8	Merge pull request #356 from DizzyEggg/clean_battlestruct ... Clean a couple of battlestructs' fields	2018-10-14 13:18:29 -05:00
Diegoisawesome	0979ea91fb	Merge pull request #357 from DizzyEggg/move_heap ... Move HEAP_SIZE to malloc and use void instead of empty argument list	2018-10-14 13:15:31 -05:00
DizzyEggg	c3113db931	Move HEAP_SIZE to malloc and use void instead of empty argument list	2018-10-14 20:00:14 +02: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
Diegoisawesome	e0bc3fd59c	Merge pull request #355 from DizzyEggg/use_eos ... Use defines for text chars	2018-10-14 12:21:37 -05:00
DizzyEggg	ecdf0fd69d	Clean battle structs	2018-10-14 18:37:52 +02:00
DizzyEggg	b73611bccb	clean battle structs	2018-10-14 18:10:54 +02:00
DizzyEggg	f47ed3268c	Finish documenting apprentice for now	2018-10-14 17:00:41 +02:00
DizzyEggg	7952cfeba5	document more of apprentice	2018-10-14 16:27:48 +02:00
DizzyEggg	84936b4260	Merge branch 'master' into apprentice	2018-10-14 15:07:16 +02:00
DizzyEggg	541043a661	Use defines for text chars	2018-10-14 15:04:25 +02:00
DizzyEggg	7a008a944a	Move 'blend_palette'.c to util.c	2018-10-14 14:43:19 +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