2551 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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	40cf61307b	Merge pull request #267 from garakmon/master ... macOS support	2018-08-11 18:37:09 -07:00
Garak	e0a9faacb5	sha1sum -> sha1	2018-08-11 21:29:54 -04:00
Garak	2cfc7bd358	change darwin check	2018-08-11 21:21:43 -04:00
Garak	296a539664	add faster builds and NODEP sections from pokeruby	2018-08-11 21:19:27 -04:00
Garak	9ee4c23a46	remove -j4	2018-08-11 21:11:28 -04:00
garak	5d899d00e0	tone down INSTALL steps	2018-08-11 21:06:27 -04:00
Diegoisawesome	419917cdb0	Merge branch 'master' of github.com:pret/pokeemerald	2018-08-11 16:59:08 -07:00
Diegoisawesome	18d5186630	Merge remote-tracking branch 'garakmon/heal-loc-2'	2018-08-11 16:57:46 -07:00
Diegoisawesome	73bdef2f67	Merge pull request #293 from Diegoisawesome/master ... Decompile field_specials	2018-08-11 16:37:06 -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
Diegoisawesome	57ce548020	Merge pull request #291 from DizzyEggg/patch-3 ... Update battle_script_commands.c	2018-08-11 16:24:34 -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	9bb7a2c7a5	make move desc compile	2018-08-12 00:09:53 +02: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
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
garak	45b730e474	copy heal_location changes from pokeruby	2018-08-07 23:05:48 -04:00
Garak	96ab357bed	Merge pull request #3 from pret/master ... syncing with source repo	2018-08-07 22:21:10 -04:00
Diegoisawesome	85ebd76cd0	Fix fanfare constant to use define	2018-08-04 18:41:53 -07:00
Diegoisawesome	4070152b0e	Merge pull request #284 from DizzyEggg/patch-1 ... Use constant in a battle script.	2018-08-04 18:32:04 -07:00
Diegoisawesome	002016e764	Merge pull request #283 from DizzyEggg/battle_pr_again ... Battle code enums in switches	2018-08-04 18:31:49 -07:00
DizzyEggg	3d5f512aec	Use constant in a battle script.	2018-08-03 18:07:45 +02: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
Diegoisawesome	722b07707c	Merge pull request #282 from DizzyEggg/stats_bits ... Add some more stat defines for battle scripts	2018-08-02 08:11:44 -07: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	df4c20f1f8	Merge pull request #281 from einstein95/master ... Port over preproc commit from pokeruby	2018-07-29 02:19:09 -07:00
einstein95	aeceecea3d	Port over 9d96147bbf	2018-07-29 20:11:04 +12:00