2396 Commits

Author	SHA1	Message	Date
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 658f9351fe9349eb16edab8d5d503ef741449d4a.	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
DizzyEggg	4cb1e880da	Reflect Type and SOAK	2018-08-11 13:30:34 +02:00
DizzyEggg	e259000dc3	Coil and Quiver Dance	2018-08-11 12:29:01 +02:00
DizzyEggg	674d35861c	Couple bug fixes	2018-08-11 12:16:00 +02:00
DizzyEggg	f126585e71	Merge with master	2018-08-11 11:05:57 +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	d230d986fa	Me First.	2018-08-05 16:43:07 +02:00
DizzyEggg	de85f88bbb	Support for two typed moves.	2018-08-05 13:57:37 +02:00
DizzyEggg	5fbeef860c	Bulletproof and a couple of new moves	2018-08-05 13:39:22 +02:00
DizzyEggg	065032bf35	Moves changing terrains	2018-08-05 12:43:57 +02:00
DizzyEggg	2218949d7c	Topsy Turvy and Ion Deluge.	2018-08-04 23:34:29 +02:00
DizzyEggg	222ea7269d	Rapid Spin blews all hazards, Quash and a couple of new move effects	2018-08-04 22:23:07 +02:00
DizzyEggg	9ff7b0e849	Effect to u16, Lucky Chant, Sucker Punch, Sticky Web and Metal Burst	2018-08-04 20:36:24 +02:00
DizzyEggg	2d73637ff4	Introduce argument and do Draining kiss	2018-08-03 19:01:03 +02:00
DizzyEggg	3d5f512aec	Use constant in a battle script.	2018-08-03 18:07:45 +02:00
DizzyEggg	39f9b1ddf0	Experience on caught mon	2018-08-03 18:01:14 +02:00
DizzyEggg	28b4d0d9dc	Make it compile	2018-08-03 00:21:40 +02:00
DizzyEggg	320120d529	Merge with master	2018-08-03 00:20:34 +02:00
DizzyEggg	c7baa71a5e	Add placeholder string for not done moves.	2018-08-02 20:32:13 +02:00
DizzyEggg	198a1a8646	Proper Sound moves and substitute	2018-08-02 20:24:18 +02:00
DizzyEggg	b73075f822	Update Unusable Moves	2018-07-31 23:09:47 +02:00
DizzyEggg	44a454ecb4	Moves with accuracy 0 bypass accuracy checks; Heal Block move effect done	2018-07-30 20:41:16 +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
DizzyEggg	2f6cc2be80	Electric types immune to paralysis	2018-07-29 12:45:08 +02:00
DizzyEggg	3d93da7133	Add Imposter	2018-07-29 12:21:28 +02:00
DizzyEggg	d628d1f5fd	Move Weather Ball, Hidden power, AI support for dynamic type moves and AI debug support	2018-07-29 11:32:40 +02:00
DizzyEggg	3a0c244f40	Add Harvest	2018-07-28 17:13:47 +02:00
DizzyEggg	ef3c39fbae	Fix Counter and Mirror Coat	2018-07-28 10:58:47 +02:00
DizzyEggg	43fc4b6933	Add Magic Bounce	2018-07-28 10:41:20 +02:00
DizzyEggg	0148cc8b0c	merge with master, gen6 move names	2018-07-28 00:01:34 +02:00