3544 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kurausukun	3ef247ce56	Merge branch 'battle_engine_v2' of https://github.com/Kurausukun/pokeemerald	2018-11-17 21:33:54 -05:00
Kurausukun	febb4a612a	Update Gen 1-3 moves to be consistent with Gen 7	2018-11-17 21:32:03 -05:00
Kurausukun	98ebd7ef5a	fix indentation	2018-11-17 21:29:46 -05:00
Kurausukun	a98ecc08aa	fix Aurora Veil's name	2018-11-17 21:16:33 -05:00
DizzyEggg	c2a3cff814	Fix physical atk stat stage and third type	2018-11-17 23:47:35 +01:00
DizzyEggg	c9f57a3b7b	Merge pull request #28 from PALPATlNE/battle_engine_work ... Fixed U-turn	2018-11-17 23:20:43 +01:00
PALPATlNE	f7cd950b69	Fixed U-turn	2018-11-17 23:17:41 +01:00
DizzyEggg	dff968d1f1	Merge pull request #26 from PALPATlNE/battle_engine_work ... Battle engine work	2018-11-17 23:04:00 +01:00
DizzyEggg	1abc024194	Merge pull request #27 from Kurausukun/battle_engine_v2 ... mud-slap should be special, not physical	2018-11-17 23:02:12 +01:00
DizzyEggg	40a44a8508	more battle pytamid	2018-11-17 22:55:39 +01:00
Kurausukun	c798d0f1d1	mud-slap should be special, not physical	2018-11-17 16:48:22 -05:00
PALPATlNE	4284816d81	Fixed Createsprite command arguments	2018-11-17 21:16:48 +01:00
PALPATlNE	a5ba055814	Added new move animations	2018-11-17 20:15:38 +01:00
PALPATlNE	fe8c70b9f8	Fix	2018-11-17 19:59:03 +01:00
DizzyEggg	eb66b60f38	Begin battle pyramid	2018-11-17 15:30:34 +01:00
DizzyEggg	15b8046b2b	Add third type	2018-11-17 12:10:24 +01:00
DizzyEggg	65036b9a09	Merge with master	2018-11-15 21:53:32 +01:00
Diegoisawesome	032dd251e6	Merge pull request #383 from garakmon/createsprite ... Update createsprite macro and rename BANK to BATTLER	2018-11-15 14:45:13 -06:00
Diegoisawesome	09d09122bc	Merge pull request #384 from garakmon/subdirs ... Subdirectories in build	2018-11-15 14:25:21 -06:00
Diegoisawesome	39f54b346d	Merge pull request #382 from Slawter666/synchronise ... Move field effects enum to defines	2018-11-15 14:24:22 -06:00
Diegoisawesome	216c388001	Merge pull request #385 from garakmon/nodep ... fix dependency scanning	2018-11-15 14:19:57 -06:00
garak	c067c4e617	fix dependency scanning	2018-11-14 19:12:12 -05:00
garak	87ec71f71b	subdirs in build	2018-11-14 17:59:30 -05:00
DizzyEggg	bb9dbc0c6d	Merge with master	2018-11-14 22:50:27 +01:00
Slawter666	4311fd8b89	Sort includes into alphabetical order	2018-11-14 00:01:50 +00:00
Slawter666	6fcf878e2f	Tidy up header files	2018-11-13 22:28:46 +00:00
garak	c6833c903c	remove extra macro and shorten names	2018-11-13 16:19:52 -05:00
garak	269aebaca7	update createsprite macro and rename BANK to BATTLER	2018-11-13 15:35:46 -05:00
Slawter666	1d46507110	Move field effects enum to defines	2018-11-13 14:19:04 +00:00
Diegoisawesome	f639c7c309	Merge pull request #380 from DizzyEggg/frontier_2 ... More battle frontier	2018-11-12 14:05:40 -06:00
DizzyEggg	b5ea69cf74	Fix conflicts	2018-11-12 19:22:23 +01:00
Diegoisawesome	54ad6794bc	Merge pull request #361 from Slawter666/synchronise ... Synchronise with pokeruby	2018-11-12 11:37:18 -06:00
DizzyEggg	734403fdfa	Merge branch 'master' into frontier_2	2018-11-12 15:42:44 +01:00
DizzyEggg	69683f9572	Decompile Battle Palace	2018-11-12 15:41:19 +01:00
Slawter666	1b895ff52c	Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise	2018-11-12 14:14:50 +00:00
Slawter666	be33878b94	Synchronise wallclock.c	2018-11-12 14:04:32 +00:00
DizzyEggg	d5abd7b696	Document Battle Pie	2018-11-12 14:36:31 +01:00
DizzyEggg	3b3cffac44	Decompile battle pike	2018-11-12 14:07:31 +01:00
DizzyEggg	4fb463377c	Start battle pike	2018-11-12 00:46:02 +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
DizzyEggg	1437755cdd	Start arena	2018-11-07 22:54:42 +01:00
Diegoisawesome	65f053fd89	Thanks Egg	2018-11-07 14:48:06 -06:00
Diegoisawesome	a052e45f27	Merge pull request #379 from DizzyEggg/derp ... ScriptMenu_MultichoiceGrid	2018-11-07 14:41:29 -06:00
DizzyEggg	01fdb01364	Diego pls	2018-11-07 21:09:54 +01:00
Diegoisawesome	7ab8ff0d81	Merge branch 'master' of github.com:pret/pokeemerald	2018-11-07 12:35:49 -06:00
Diegoisawesome	9f50ba1ce3	Fix incorrect compressed types, part 2	2018-11-07 12:35:31 -06:00
Diegoisawesome	1507a290d5	Merge pull request #378 from Diegoisawesome/script_menu ... [WIP] Decompile/port script_menu	2018-11-06 20:24:04 -06: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