2120 Commits

Author	SHA1	Message	Date
GriffinR	6923f0e369	Document lilycove_lady.inc	2019-10-21 20:19:37 -05:00
GriffinR	a7ffa96578	Rename mart_attendant to mart_clerk	2019-10-21 17:22:19 -05:00
GriffinR	c70162086b	Split some smaller files from event_scripts	2019-10-21 17:22:19 -05:00
GriffinR	973e6f9667	Document mauville_man.inc	2019-10-21 17:21:53 -05:00
Marcus Huderle	2f36bd62d7	Document Oldale scripts	2019-10-21 16:44:20 -05:00
Sewef	64cf2d70fa	battle_anim_effects_3 (3)	2019-10-21 18:36:45 +02:00
Sewef	b24e7a5933	battle_anim_effects_3 (2)	2019-10-21 18:29:59 +02:00
Sewef	c8e0e89f8e	battle_anim_effects_3	2019-10-21 18:19:07 +02:00
Sewef	afdc8da297	Update battle_anim_scripts.s	2019-10-21 18:06:36 +02:00
Marcus Huderle	04ea8eea5a	Document rest of Petalburg scripts	2019-10-20 12:36:35 -05:00
Sewef	41e952a668	battle_anims_effects_2 ... Fixes	2019-10-20 12:29:08 -05:00
Sewef	e9675bdd24	battle_anims_effects_2	2019-10-20 12:29:08 -05:00
Sewef	def7a4a18a	more battle_anims_effects_2	2019-10-20 12:29:08 -05:00
Sewef	8531a17e10	battle_anims_effects_2	2019-10-20 12:29:08 -05:00
Sewef	e90c708383	battle_anims_effects_2	2019-10-20 12:29:08 -05:00
Sewef	3b0d9e134f	battle_anims_effects_2	2019-10-20 12:29:08 -05:00
Sewef	49ad6da8fb	starting battle_anim_effects_2	2019-10-20 12:29:08 -05:00
GriffinR	ac399ade4a	Document safari zone scripts	2019-10-20 09:53:21 -05:00
GriffinR	0db188b487	Clean up berry_tree.inc and misc adjacent documentation	2019-10-20 09:46:46 -05:00
Marcus Huderle	cefc31dd1e	Document Petalburg City scripts	2019-10-19 15:05:15 -05:00
DizzyEggg	e736c369d6	Merge with master	2019-10-19 17:47:55 +02:00
huderlem	cb9f89925f	Merge pull request #841 from GriffinRichards/document-gyms2 ... Document Petalburg, Fortree, Mossdeep, and Sootopolis Gyms	2019-10-19 08:05:11 -05:00
Sewef	19fb0fb220	Merge branch 'master' into patch-2	2019-10-16 19:35:33 +02:00
Sewef	9dcfc5ba73	Fix labels	2019-10-16 19:10:39 +02:00
GriffinR	b4a9298205	Merge branch 'master' into document-gyms2	2019-10-16 04:22:34 -04:00
GriffinR	20fa13616f	Condense fallthrough script	2019-10-16 04:14:51 -04:00
GriffinR	0f15264595	Document rotating_tile_puzzle	2019-10-16 04:09:30 -04:00
GriffinR	60a592a2c3	Condense fallthrough scripts	2019-10-15 17:09:47 -05:00
GriffinR	348bb002a8	Document Gym scripts first half	2019-10-15 17:09:47 -05:00
huderlem	a0b3f5d9e3	Merge pull request #833 from GriffinRichards/doc-inc2 ... Document .incs split from event_scripts Round 2	2019-10-15 16:30:27 -05:00
GriffinR	90a05cf824	Finish Mossdeep Gym doc, beging documenting rotating tile puzzle	2019-10-15 05:06:13 -04:00
GriffinR	1b41b8b7ca	Document Petalburg, Fortree, Sootopolis, and some of Mossdeep Gyms	2019-10-15 05:05:57 -04:00
Sewef	07ac727c6d	Document Oamdata in battle_anim (#838)	2019-10-14 18:26:47 -05:00
GriffinR	928cdf2531	Merge branch 'master' into doc-inc2	2019-10-14 19:25:10 -04:00
Sewef	975c0ce1d0	Label battle_anim_effects_1	2019-10-14 23:27:12 +02:00
Sewef	65b82d67c9	Revert "More battle_anim_effects_1 labels" ... This reverts commit 00331a644a.	2019-10-14 23:22:44 +02:00
Sewef	5a366e8d72	More battle_anim_effects_1 labels	2019-10-14 22:51:45 +02:00
Sewef	00331a644a	More battle_anim_effects_1 labels	2019-10-14 22:42:15 +02:00
Sewef	299166edee	Document subs & AnimTask in battle_anim_effects_1	2019-10-14 22:08:03 +02:00
Sewef	46f2cc5449	battle_anim_effects_1 main callbacks	2019-10-14 21:17:38 +02:00
Sewef	63b5be9259	Ended battle_anims_effects_1 SpriteTemplates	2019-10-14 21:05:40 +02:00
Sewef	a49756a8fe	Update battle_anim_scripts.s	2019-10-13 22:37:39 +02:00
GriffinR	30ef494163	Merge branch 'master' into doc-inc2	2019-10-13 15:44:07 -04:00
GriffinR	60a9dc6a0e	Fix map script names	2019-10-13 15:40:15 -04:00
GriffinR	bb23128b77	Merge conflict resolves into review changes	2019-10-13 15:33:19 -04:00
GriffinR	144c5888a1	Fix map script names	2019-10-13 15:29:53 -04:00
GriffinR	a081124a20	Merge branch 'master' into doc-inc	2019-10-13 15:26:44 -04:00
Marcus Huderle	e47b3efdfe	Unify showmonpic and hidemonpic script command names with their function names	2019-10-12 18:58:54 -05:00
Marcus Huderle	8df4982b3f	Merge remote-tracking branch 'upstream/master' into document-trade	2019-10-12 15:39:17 -05:00
GriffinR	4e2be7ff5e	Review changes for #835	2019-10-12 15:14:57 -05:00
GriffinR	714b122da6	Fix indentation	2019-10-12 15:14:57 -05:00
GriffinR	1c99f5b7c9	Split text from cable_club.inc	2019-10-12 15:14:57 -05:00
GriffinR	1b7607bd91	Document cable_club.inc	2019-10-12 15:14:57 -05:00
DizzyEggg	bae5d2038f	Update with master	2019-10-10 16:18:48 +02:00
GriffinR	70d1d8956e	Document elite_four.inc and the E4 map scripts	2019-10-08 02:25:31 -04:00
GriffinR	2368f57669	Merge branch 'master' into doc-inc	2019-10-07 17:37:35 -04:00
GriffinR	d8f5e73bb7	Merge branch 'master' into doc-inc	2019-10-07 17:37:04 -04:00
GriffinR	bcf74df27f	Use B_OUTCOME constants for GetBattleOutcome	2019-10-07 16:36:47 -05:00
GriffinR	7ba11b7a1b	Use VAR_FACING constants	2019-10-07 16:36:02 -05:00
GriffinR	628301d6d5	Document unusual_weather.inc	2019-10-07 11:29:14 -04:00
GriffinR	9553ec1d28	Document mevent.inc	2019-10-07 10:34:12 -04:00
GriffinR	0df304d629	Document roulette.inc	2019-10-07 02:00:16 -04:00
GriffinR	81ee8f07ef	Document pc.inc and prof_birch.inc	2019-10-07 01:13:34 -04:00
GriffinR	c4deb4db96	Document field_poison	2019-10-06 20:04:30 -04:00
GriffinR	f179ab95c0	Document move tutors	2019-10-06 17:30:17 -04:00
GriffinR	02070eaf73	Document kecleon	2019-10-06 16:06:34 -04:00
GriffinR	748a1dbdd4	Document cave hole	2019-10-06 14:16:37 -04:00
GriffinR	d914c1d659	Document common movements	2019-10-06 13:55:30 -04:00
GriffinR	749247b910	Convert 4 spaces in .inc to tab	2019-10-05 10:52:48 -04:00
GriffinR	dadb1cb9f1	More trade/union room doc, incidental party_menu doc	2019-10-04 23:31:25 -04:00
GriffinR	c3c8fb40cf	Move trade data, some trade.c clean up documentation	2019-10-03 01:16:22 -04:00
GriffinR	2ac3ad3e60	Review changes for #819 and merge	2019-10-02 12:40:00 -04:00
PikalaxALT	cb528cb543	Merge pull request #821 from GriffinRichards/document-textinput ... Document text input strings	2019-10-02 09:49:26 -04:00
GriffinR	9aed405851	Document a few field specials	2019-09-30 01:42:52 -04:00
GriffinR	53bc1bd0d1	Document text input strings	2019-09-30 00:09:29 -04:00
GriffinR	67152b9242	Split off more files from event_scripts	2019-09-28 02:37:01 -04:00
GriffinR	75869a880c	Move running shoes script	2019-09-27 15:27:08 -04:00
GriffinR	12cc7ef34c	Split more files from event_scripts	2019-09-27 14:20:51 -04:00
GriffinR	73b96fe145	Rename CONTACT macros to ON_DAMAGE	2019-09-27 12:27:36 -04:00
GriffinR	86f1f9066a	Split some files from event_scripts	2019-09-27 12:22:58 -04:00
GriffinR	0c1f1281da	Review changes for #778	2019-09-27 10:08:47 -04:00
GriffinR	3bf8129396	Clean up new Cmd macro names	2019-09-27 02:54:28 -04:00
GriffinR	1491b1855b	Merge branch 'master' into document-eventscripts	2019-09-26 15:03:22 -04:00
GriffinR	1016b23918	Merge branch 'master' into rename-tablecmds	2019-09-26 15:02:38 -04:00
GriffinR	37373c1b21	Review changes for #817	2019-09-25 18:46:25 -05:00
GriffinR	4e98a0cc4b	Remove Egg parent constants	2019-09-25 18:46:25 -05:00
GriffinR	801ca37f04	Document day_care.inc and related	2019-09-25 18:46:25 -05:00
GriffinR	de6e1e9ecf	Use multi constants from merge	2019-09-23 00:36:49 -04:00
GriffinR	a180d2af49	Merge branch 'master' into document-eventscripts	2019-09-22 12:18:48 -04:00
GriffinR	8e4e344c7d	Merge branch 'master' into document-scriptmenu	2019-09-22 09:45:44 -04:00
GriffinR	80f58f7b24	Document PLAYER_HAS constants, consolidate poke constants	2019-09-22 08:14:22 -05:00
GriffinR	b6dffcf8b7	Clean up script_menu documentation	2019-09-19 19:23:24 -04:00
GriffinR	9fb24bbbce	Remainder of script_menu documentation	2019-09-19 18:31:09 -04:00
GriffinR	275695c189	Document more script_menu, lilycove harbor	2019-09-19 17:27:34 -04:00
GriffinR	de0084ef7a	Document multichoice ids	2019-09-19 00:56:51 -04:00
GriffinR	b596322ca2	Initial script_menu documentation	2019-09-18 18:57:25 -04:00
GriffinR	58b8d7c297	Merge branch 'master' into document-eventscripts	2019-09-17 18:01:20 -04:00
GriffinR	6ab192e739	Review changes for #807	2019-09-17 16:50:17 -05:00
GriffinR	6ab49da811	Clean up field_specials documentation	2019-09-17 16:50:17 -05:00
GriffinR	3dbd375779	Some frontier field_specials documentation	2019-09-17 16:50:17 -05:00
GriffinR	aac9658a8e	Document some field_specials data	2019-09-17 16:50:17 -05:00
GriffinR	945d3d3a27	Merge branch 'master' into document-eventscripts	2019-09-17 00:10:23 -04:00
GriffinR	06af24bce5	Use misc ScrCmd constants	2019-09-16 19:44:47 -05:00
GriffinR	f4160ded98	Fix misnamed function	2019-09-16 00:29:59 -04:00
GriffinR	bb236b490d	Update BS constants for Cmd rename	2019-09-15 17:58:12 -04:00
GriffinR	826fc3154e	condense secret base mapscript labels	2019-09-06 13:01:45 -04:00
GriffinR	cb82d868af	fix secret base jsons	2019-09-06 02:49:26 -04:00
GriffinR	9fbcd552de	document remainder of secret_base scripts, delete unneeded scripts.incs	2019-09-06 02:12:00 -04:00
PikalaxALT	f3bed6045e	Disassemble data/ereader_screen.s	2019-09-05 20:48:48 -05:00
PikalaxALT	b510100503	Port trainer hill sets to C objects	2019-09-05 20:48:48 -05:00
Eduardo Quezada D'Ottone	de02805388	Changed names.	2019-09-05 20:42:15 -05:00
Eduardo Quezada D'Ottone	e2689d2a27	Documented Mechadoll answers.	2019-09-05 20:42:15 -05:00
GriffinR	8c6b5648d4	document secret_base_1.inc	2019-09-05 16:16:21 -04:00
GriffinR	1d703e786b	move some data out of event_scripts, use game stat constants	2019-09-05 14:56:34 -04:00
GriffinR	6b04ea0727	Merge branch 'master' into document-eventscripts	2019-09-03 22:22:14 -04:00
PikalaxALT	1f4c88c952	Copy Berry Fix MB dism from FR (#777) ... * Copy Berry Fix MB dism from FR	2019-09-03 15:33:11 -04:00
DizzyEggg	a41ecf7101	more ai stuff, baton pass perish song strats	2019-08-30 17:57:19 +02:00
DizzyEggg	f979987c2f	Fix Intimidate and Trace on new switch in system	2019-08-30 12:25:21 +02:00
DizzyEggg	6a3b74c59c	Use item constant in pretty petal flower shop	2019-08-30 09:48:59 +02:00
DizzyEggg	91b364e8d6	Ai use most powerful move smarrter	2019-08-27 18:29:34 +02:00
DizzyEggg	bfa357a608	Fix Ai Roost	2019-08-27 14:00:47 +02:00
DizzyEggg	e96e98a8de	Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-08-25 13:10:32 +02:00
GriffinR	869d0eebc0	Rename atk## constants and states	2019-08-23 08:46:21 -04:00
DizzyEggg	30dd8942e5	Don't use Protect when burned	2019-08-22 16:42:55 +02:00
GriffinR	a46f7952f9	Use DIR constants for createvobject ... Also uses event object ids in LinkContestRoom1	2019-08-21 17:11:06 -05:00
GriffinR	f08615881e	Changes from review	2019-08-21 17:06:55 -05:00
GriffinR	5fb7ab05dd	clean up	2019-08-21 17:06:55 -05:00
GriffinR	d931ba9602	document remaining funcs	2019-08-21 17:06:55 -05:00
GriffinR	7fc99f3952	favor lady funcs	2019-08-21 17:06:55 -05:00
GriffinR	009caa21c8	some contest lady funcs	2019-08-21 17:06:55 -05:00
GriffinR	23979c4d7d	initial documentation commit	2019-08-21 17:06:55 -05:00
tustin2121	82744ba636	Replace {STRING 5} with {KUN} ... Since we already have the KUN placeholder, there's no need for this {STRING 5} stuff. Also, it makes it easier to delete all the {KUN}s in hacks later on if desired.	2019-08-21 14:05:22 -04:00
DizzyEggg	e4787bacbc	merge	2019-08-19 14:50:47 +02:00
Tustin2121	18dee14170	Review fixes	2019-08-17 23:26:46 -04:00
Tustin2121	d63a8ba817	Replaced createvobject numbers with EVENT_OBJ_GTX defines ... Doing this allows someone to renumber the event object graphics and still have working contests.	2019-08-17 13:38:13 -04:00
Tustin2121	1069adae46	Renaming unknown link room ids to be the same as name ... This descrepency was causing a lot of annoyance when using porymap, because porymap generated the ids in map_groups.h from the name, and mapjson was generating map_groups.h from the id in the json files. So just name them the same already like every other map in the repo.	2019-08-17 13:26:57 -04:00
Tustin2121	f4d4424618	Folded nops into hidemoneybox and updatemoneybox ... The nops are essential to the hidemoneybox and updatemoneybox commands when using vanilla versions of those commands. Even though they're not actually used parameters in the command implementation, they are still consumed, which means if someone were to get rid of the nops (as I did in TriHard) it causes the commands to consume bytecode that are not theirs, resulting in undefined behavior usually leading to softlocks. Folding the extra bytes into the macros means there's no chance of the extra bytes getting losts in scripts.	2019-08-17 13:25:36 -04:00
Tustin2121	6508469259	Rename movobjectoffscreen to copyobjectxytoperm ... Renaming the command to something that makes more sense as to what the command actually does. The command copies the current xy of the instantiated object back to its template, so that the object remains in the same place if the player walks away and despawns the object, and then comes back. "moveobjectoffscreen" implies that it might be taking the object and moving it physically to an off-screen location somehow.	2019-08-17 13:18:56 -04:00
Tustin2121	ea724278b7	Juan text buffer overflow note	2019-08-17 13:05:55 -04:00
GriffinR	ecf2097abb	initial event_scripts documentation	2019-08-14 23:38:42 -04:00
DizzyEggg	aebac38922	Fix AnimTask_ShakeMon arguments	2019-08-14 12:20:06 +02:00
DizzyEggg	fabbc9ae31	Merge with master	2019-08-14 11:48:08 +02:00
DizzyEggg	c9de753ecc	Illusion	2019-08-08 13:06:55 +02:00
PikalaxALT	9beeba8424	Merge pull request #764 from GriffinRichards/document-varnames ... Document vars that are used and unnamed	2019-08-05 11:59:53 -04:00
GriffinR	191f74525d	name unused route state vars	2019-08-05 11:50:29 -04:00
GriffinR	c2bf668fdd	rename town/city vars	2019-08-05 11:23:45 -04:00
DizzyEggg	2863045241	Fix switch-in abilities text/pop-up	2019-08-05 11:24:49 +02:00
DizzyEggg	c219776034	Merge with master	2019-08-04 23:09:28 +02:00
DizzyEggg	1641579297	Merge branch 'master' into pok_jump	2019-08-04 00:02:13 +02:00
GriffinR	0f5d96e5f5	name used and unnamed vars	2019-08-03 14:12:48 -04:00
PikalaxALT	9f50c4fa80	Merge pull request #760 from ultima-soul/use_pokeblock_data ... Decompile use_pokeblock data	2019-08-03 11:01:05 -04:00
DizzyEggg	9306c142b3	Merge dodrio with master	2019-08-02 00:45:49 +02:00
DizzyEggg	4d2d8779bf	Dodrio berry picking decompiled	2019-08-02 00:41:55 +02:00
DizzyEggg	02cadbee60	MORE DODRIO BERRY PICKINGgit status!	2019-08-01 19:01:50 +02:00
ultima-soul	9a152f8fe6	Decompile data/use_pokeblock.s	2019-07-30 17:21:17 -07:00
DizzyEggg	ba1a70419a	Start dodrio magic	2019-07-31 00:27:30 +02:00
DizzyEggg	e634e722cc	Decompile pokemon jump	2019-07-29 12:35:57 +02:00
garak	dfa3e079c0	finish pokenav data decomp	2019-07-19 22:57:33 -04:00
garak	f9a9297d4f	decompile pokenav 7/8 data	2019-07-19 22:06:42 -04:00
garak	f6d55db535	decompile pokenav_unk_5 data	2019-07-19 21:05:55 -04:00
garak	690a0c4390	decompile pokenav_unk_4 rodata	2019-07-19 19:36:17 -04:00
garak	c400d1dc7f	decompile pokenav_unk_3 data	2019-07-19 18:31:42 -04:00
garak	b68ab6106d	pokenav unk 2 data decomp	2019-07-19 17:23:52 -04:00
Xhyzi	d66b9022a6	Added 46 move animations ... - Magnet Bomb. - Mirror Shot. - Aqua Ring. - Aqua Tail. - Aqua Jet. - Attack Order. - Defend Order. - Heal Order. - Dragon Rush. - Dragon Pulse. - Discharge. - Magnet Rise. - Charge Beam. - Shadow Claw. - Shadow Force. - Ominous Wind. - Lava Plume. - Magma Storm. - Avalanche. - Vacuum Wave. - Force Palm. - Lucky Chant. - Double Hit. - Giga Impact. - Captivate. - Rock Climb. - Last Resort. - Grass Knot. - Wood Hammer. - Zen Headbutt. - Lunar Dance. - Trick Room. - Psycho Cut. - Power Gem. - Stone Edge. - Rock Wrecker. - Head Smash. - Sealth Rock. - Punishment. - Sucker Punch. - Nasty Plot. - Switcheroo. - Earth Power. - Gunk Shot. - Defog. Fix Pyscho Shift Hollow Orb graphics were not being loaded before creating the sprite Fix Gastro Acid anim Fix gastro acid palette asignation. .	2019-07-13 01:02:09 +02:00
DizzyEggg	3e476adf4a	Stockpile gen4 effect and fixed spit up	2019-07-09 19:06:12 +02:00
DizzyEggg	385fc49ef3	Merge pull request #163 from SBird1337/feature/animpack2 ... Some animations	2019-07-07 09:49:09 +02:00
Karathan	d9b54c3c1c	add power swap, guard swap, worry seed	2019-07-06 05:22:18 +02:00
Karathan	8126662cfb	update wring out with trace, remove AGBPrintf	2019-07-03 14:10:29 +02:00
Karathan	e9884154a9	added acupressure and wring out	2019-07-03 03:45:11 +02:00
Karathan	f1c82abc7e	fix change requests	2019-07-02 18:34:53 +02:00
Karathan	501ae27390	add trump card, fix a few issues with pluck	2019-07-02 18:26:59 +02:00
Karathan	5f7b5ba453	add feint and pluck animation sprites and implementations	2019-07-02 06:22:05 +02:00
DizzyEggg	10c27ac6a6	Fix a typo that crashes the gamae	2019-06-25 12:26:27 +02:00
DizzyEggg	a98c5ab78a	Merge branch 'master' into battle_engine_v2	2019-06-24 12:12:56 +02:00
garak	a43dcd26bd	finish labeling metatiles	2019-06-16 10:08:07 -05:00
garak	713f61de7c	continue labeling metatiles for scripts	2019-06-16 10:08:07 -05:00
DizzyEggg	aaea5398f4	Fix Castfrom ability pop-up and refactor one function	2019-06-14 12:58:29 +02:00
DizzyEggg	9e175c9f1b	Merge branch 'master' into battle_engine_v2	2019-06-10 11:21:16 +02:00
DizzyEggg	f64c1dfabf	Some pokenav work	2019-05-26 07:20:51 -05:00
Slawter666	5f292d621a	Use event object constants	2019-05-25 14:41:48 -05:00
DizzyEggg	39770f7fde	Use constants for new game berries setting script	2019-05-25 08:27:07 -05:00
DizzyEggg	76c5287629	Bug Bite	2019-05-23 12:32:14 +02:00
DizzyEggg	32aeba21e0	Some AI tweaking	2019-05-23 11:41:35 +02:00
DizzyEggg	1b7493e47a	Fix Flame Burst crashing the game	2019-05-23 10:02:04 +02:00
DizzyEggg	8e904ebacb	helping hand ai	2019-05-20 14:36:46 +02:00
DizzyEggg	e00890a555	Fix Air Baloon msg	2019-05-20 12:20:49 +02:00
DizzyEggg	e1ea4b62e9	Natural Gift	2019-05-20 12:03:00 +02:00
DizzyEggg	269f573297	Fix powder and resist berry string	2019-05-20 10:10:00 +02:00
DizzyEggg	09c0a195ac	Merge branch 'master' into battle_engine_v2	2019-05-20 09:05:12 +02:00
Flametix	dbdb827e54	Fix typos (#713) ... * fix typos	2019-05-18 21:56:19 -05:00
DizzyEggg	f22f7866ac	Merge with master, fix conficts	2019-05-17 09:52:20 +02:00
garak	daecd5ec40	name some trainer card related functions	2019-05-16 17:10:13 -05:00
DizzyEggg	94045ace0b	Merge branch 'master' into battle_engine_v2	2019-05-15 13:31:53 +02:00
Fontbane	d9115ada86	Use species constants for VAR_TEMP_1 before givemon	2019-05-13 10:16:28 -05:00
PikalaxALT	539d472796	Merge branch 'master' into dodrio_berry_picking	2019-05-11 21:22:09 -04:00
DizzyEggg	824a95fe07	Incinerate	2019-05-10 15:12:33 +02:00
DizzyEggg	d027bb0d7a	Life Flame toxic orbs	2019-05-10 11:03:33 +02:00
DizzyEggg	875b413a09	Various battle target items	2019-05-09 20:31:58 +02:00
DizzyEggg	bb8e397e5b	Gems and dmg reducing berries	2019-05-07 15:26:58 +02:00
DizzyEggg	900c15c20c	Mega evo animation	2019-05-03 17:27:49 +02:00
DizzyEggg	d0f91a996d	Tweak up mega evo	2019-05-02 23:10:01 +02:00
DizzyEggg	a7f2fa67ef	Merge pull request #142 from thechurchofcage/beta ... Magnetic Flux + Gear Up	2019-05-01 11:11:46 +02:00
DizzyEggg	bbe3a28b78	Merge with master	2019-05-01 11:10:41 +02:00
Fontbane	901a83d249	Fix some labels and include decorations.h ... Include decorations.h in shop.c Include decorations.h in event_scripts.s	2019-04-22 17:23:59 -05:00
Fontbane	6cf06d5f95	Doc some event scripts ... Doc decoration shops Revert "Doc decoration shops" This reverts commit 64d935ea0dc942c32b89487137e5703fce34b435. Document through comments Un-revert decor documentation	2019-04-22 17:23:59 -05:00
Fontbane	2c076f1f3e	Doc most OnTransitions	2019-04-22 17:23:59 -05:00
AJ Fontaine	dbdb51e1a5	Start documenting event scripts	2019-04-22 17:23:59 -05:00
Papa Cancer	3cde800bd0	Magnetic Flux + Gear Up ... Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities. Magnetic Flux uses Charge animation.	2019-04-20 20:17:56 +01:00
Papa Cancer	b50007e861	Instruct ... Re-PR'd due to excess "merges"	2019-04-20 20:11:49 +01:00
Papa Cancer	7e99272482	Laser Focus ... Re-PR'd due to excess "merges"	2019-04-20 20:02:52 +01:00
Papa Cancer	c4acc3dbf8	Merge branch 'battle_engine_v2' into beta	2019-04-20 16:49:57 +01:00
DizzyEggg	5b43a9289d	Merge pull request #134 from thechurchofcage/epsilon ... Baneful Bunker + King's Shield	2019-04-20 08:42:35 +02:00
Papa Cancer	e310d0f10e	Core Enforcer ... New code - uses Gastro Acid script instead through own move effect	2019-04-18 12:10:18 +01:00
Papa Cancer	754befe393	Baneful Bunker + King's Shield ... Both apply a move effect from atk49. King's Shield swaps attacker and defender for the sake of Defiant etc. and then swaps them back!	2019-04-17 14:54:21 +01:00
Papa Cancer	e5e45bbcf5	Throat Chop ... Added strings that show when Throat Chop prevents move usage. Added extra string (not present in games) to show when it ends as there is no indication otherwise. Fixed Embargo's string as well.	2019-04-17 13:52:25 +01:00
DizzyEggg	59797e4801	Use constants in battle_anim_special.c	2019-04-14 10:19:50 -05:00
Marcus Huderle	1268691410	Finish decompiling pokenav_unk_1.c	2019-04-13 16:18:04 -05:00
DizzyEggg	549a9cdcc2	Merge pull request #118 from thechurchofcage/beta ... Stomping Tantrum	2019-04-13 14:09:15 +02:00
DizzyEggg	2646f3b26a	Merge with master	2019-04-13 13:42:44 +02:00
Marcus Huderle	a65cffef42	Decompile more pokemon_jump.c	2019-04-10 20:34:17 -05:00
DizzyEggg	91aafa2ebc	Heal Block anim with volume change task	2019-04-09 12:49:50 +02:00
DizzyEggg	1c73e61a2b	Parabolic Charge anim	2019-04-08 16:48:04 +02:00
DizzyEggg	27d645ad8a	Merge pull request #123 from thechurchofcage/delta ... Leaf Storm animation	2019-04-08 15:20:09 +02:00
DizzyEggg	9ffa74674c	Merge pull request #125 from thechurchofcage/epsilon ... Hold Hands fix	2019-04-08 15:19:14 +02:00
DizzyEggg	0e02c28927	Merge with master	2019-04-08 09:37:41 +02:00
Phlosioneer	50350cc2e1	Merge branch 'master' into contest-ai-cleanup	2019-04-07 20:20:22 -04:00
huderlem	a4ea0ac816	Merge pull request #645 from Phlosioneer/pokenav-decomp-again ... Pokenav decomp again	2019-04-07 18:03:32 -05:00
Phlosioneer	0dc73b0b3a	Break up pokenav into subfiles ... The files are separated based on the pokenav resources substruct ID they use.	2019-04-07 14:40:35 -04:00
Marcus Huderle	78151b6d88	Start decompiling pokemon_jump.c	2019-04-07 13:12:27 -05:00
Phlosioneer	d84d94e29a	Merge branch 'master' into pokenav-decomp-again	2019-04-07 01:56:36 -04:00
Papa Cancer	fd6dc98045	Hold Hands fix ... Better check for valid ally. If there isn't one, the target defaults to the attacker, causing the move to fail.	2019-04-06 22:23:34 +01:00
Papa Cancer	255ac6b54d	Leaf Storm animation ... All credit to Doesnt, just stole it from his pokeruby build	2019-04-06 22:02:22 +01:00
Marcus Huderle	c3cfd60658	Generate zoom_tiles palette from correct image	2019-04-06 15:16:05 -05:00
Marcus Huderle	146da2df96	Generate palette from zoom_tiles.png	2019-04-06 14:48:46 -05:00
DizzyEggg	f8713f9c15	Merge with master	2019-04-06 20:43:13 +02:00
Fontbane	6a14cd418e	Match	2019-04-06 12:48:50 -05:00
Fontbane	4a09a5da33	Doc field move scripts completely, use fldeff constants for dofieldeffect ... Fix labels Fix labels again Delete extra boulder scripts Now it should build fine	2019-04-06 12:48:50 -05:00
AJ Fontaine	621e5d2263	Start documenting field move scripts	2019-04-06 12:48:50 -05:00
DizzyEggg	b85a74afc5	Give names to battle anim backgrounds	2019-04-06 12:44:27 -05:00
DizzyEggg	5183cdb357	change anim sprite name	2019-04-06 10:14:48 -05:00
Phlosioneer	bc50686158	Decomp everything onvolving UnknownSubStruct_81C81D4 ... Now I can start cleaning up the fields and substructs	2019-04-06 03:42:14 -04:00
Papa Cancer	33d484a7ed	Merge branch 'battle_engine_v2' into beta	2019-04-06 00:38:56 +01:00
Papa Cancer	43525d2a9c	Merge branch 'battle_engine_v2' into delta	2019-04-05 23:13:41 +01:00
DizzyEggg	a83255d103	fix after prs	2019-04-06 00:03:03 +02:00
DizzyEggg	0aefbe1098	Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2	2019-04-05 23:47:55 +02:00
DizzyEggg	794c9aa255	Merge pull request #121 from thechurchofcage/epsilon ... Three pointless moves	2019-04-05 23:47:54 +02:00
DizzyEggg	7c8f69e6e3	Merge pull request #109 from Fontbane/patch-4 ... Field Effects for Gen IV Abilities	2019-04-05 23:40:30 +02:00
Marcus Huderle	033580da96	Document secret base	2019-04-05 16:24:57 -05:00
Papa Cancer	4c8bc9d526	Three pointless moves ... Celebrate, Hold Hands and Happy Hour. Yay(!) Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money. Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)	2019-04-05 18:10:02 +01:00
Fontbane	e8dd8f93d1	Remove Honey functionality	2019-04-05 10:33:19 -04:00
DizzyEggg	dd24597d52	Finish up menu specialised	2019-04-05 07:53:23 -05:00
PikalaxALT	a58d9a16dd	Merge branch 'master' into dodrio_berry_picking	2019-04-05 08:41:31 -04:00
DizzyEggg	05487c8820	animation for power whip, it sucks i know	2019-04-05 14:21:33 +02:00
DizzyEggg	c9cabe8d59	Bug Buzz animation	2019-04-05 14:04:38 +02:00
DizzyEggg	978781d656	Improve Tailwind animation	2019-04-05 13:38:13 +02:00
DizzyEggg	183b714ff1	Merge with master and fix web moves	2019-04-05 12:43:44 +02:00
Fontbane	9e74409bb2	Fix labels, label more scripts	2019-04-04 19:34:35 -05:00
Fontbane	8b88ef3e01	Document berry tree events	2019-04-04 19:34:35 -05:00
Fontbane	90e32f4ec5	Document landmark setting and item balls	2019-04-04 19:34:35 -05:00
PikalaxALT	c46f271f67	Documentation of ereader_helpers, 1	2019-04-04 19:26:45 -05:00
PikalaxALT	53efbe2832	Finish decomp of union_room_chat	2019-04-04 19:26:45 -05:00
PikalaxALT	a47abb3949	union_room_chat data, 1	2019-04-04 19:26:45 -05:00
Phlosioneer	3b3b2dd031	General cleanup of the second half of contest.c	2019-04-03 20:43:23 -04:00
PikalaxALT	4fadbaf161	Minor fixes ... gotoram --> returnram cmdCF/execram --> gotoram fix indentation in sym_ewram.txt fix mevent_client.h guard name	2019-04-03 17:04:42 -05:00
PikalaxALT	28646ea64e	Decompile mevent server scripts	2019-04-03 17:04:42 -05:00
PikalaxALT	6c12d154e7	Reformat mevent server and client scripts	2019-04-03 17:04:42 -05:00
PikalaxALT	03badd9c40	mevent_server_ish	2019-04-03 17:04:42 -05:00
PikalaxALT	dabd1f6177	finish mevent_server.s	2019-04-03 17:04:42 -05:00
PikalaxALT	a455d98385	start porting mevent_server from firered	2019-04-03 17:04:42 -05:00
Phlosioneer	3a2ea40188	Rename and document more contest setup functions ... Also properly label the link contest flags variable, and label the contest window ID's.	2019-04-03 17:24:32 -04:00
Marcus Huderle	181baf9fe5	Merge remote-tracking branch 'upstream/master' into misc_docs ... # Conflicts: # src/field_weather_effect.c	2019-04-02 18:29:51 -05:00
Marcus Huderle	1241700b20	Finish documenting the other weather effects	2019-04-02 18:28:56 -05:00
DizzyEggg	baa187665b	Document a bit of script menu and battle anims	2019-04-02 16:28:38 -05:00
DizzyEggg	1aa95a1821	Document a bit of anims	2019-04-02 07:31:06 -05:00
DizzyEggg	79fec8a38d	Energy Ball animation	2019-04-02 13:05:20 +02:00
DizzyEggg	7f07aae89b	Power-up-Punch animation	2019-04-02 09:22:28 +02:00
DizzyEggg	cd3de7821e	Merge branch 'master' into battle_engine_v2	2019-04-02 08:37:54 +02:00
DizzyEggg	63b04d5d6f	Iron Head animatiion	2019-04-02 07:33:19 +02:00
PikalaxALT	7571969a45	Finish union room battle	2019-04-01 22:08:50 -05:00
PikalaxALT	4be97b2dc6	through sub_801A960	2019-04-01 22:08:50 -05:00
Phlosioneer	845307b3a6	Rename contest AI stuff	2019-04-01 22:16:07 -04:00
DizzyEggg	743a42fec2	Cross Poison animation	2019-04-01 23:39:30 +02:00
DizzyEggg	22be08f723	Revert Bubblebeam to hit only one target	2019-04-01 23:17:50 +02:00
DizzyEggg	737c49853b	Fix Flare Blitz	2019-04-01 23:08:21 +02:00
DizzyEggg	88424b0ea3	Support for custom multi battle choose mons	2019-04-01 21:56:25 +02:00
Papa Cancer	c9ad96d228	Stomping Tantrum ... Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles base power if the timer is set.	2019-04-01 20:06:45 +01:00
PikalaxALT	08f4d3e105	Rename these objects to union_room_battle	2019-04-01 14:41:37 -04:00
PikalaxALT	4ea8217f81	file split	2019-04-01 14:25:58 -04:00
PikalaxALT	1fe5208560	through sub_801A02C	2019-04-01 12:05:58 -04:00
DizzyEggg	62863516c8	Fix Bubblebeam animation in double battles	2019-04-01 15:03:04 +02:00
DizzyEggg	14a34b002a	Electroweb animation	2019-04-01 14:43:18 +02:00
huderlem	1e8e5af033	Merge pull request #607 from Phlosioneer/contest-data ... Contest data	2019-04-01 07:37:15 -05:00
DizzyEggg	944dc4f6bf	Merge with master	2019-04-01 13:40:42 +02:00
DizzyEggg	62192b86f7	Aroma Veil	2019-04-01 11:42:37 +02:00
Phlosioneer	37c7441a15	Merge branch 'master' into contest-data	2019-03-31 20:22:47 -04:00
Phlosioneer	207a54393c	Fix mistakes and use EVENT_OBJ_GFX_* macros	2019-03-31 20:07:24 -04:00
PikalaxALT	ade0183378	Document mystery_gift	2019-03-31 18:59:52 -04:00
PikalaxALT	93c4e35d84	infer additional file split after task00_mystery_gift	2019-03-31 15:43:51 -05:00
PikalaxALT	aafe9df454	through sub_8018798	2019-03-31 15:43:51 -05:00
PikalaxALT	f34cda3b52	Start decompiling mystery gift	2019-03-31 15:43:51 -05:00
DizzyEggg	e878de782e	Merge pull request #114 from thechurchofcage/gamma ... Misc. move updates	2019-03-31 22:08:14 +02:00
DizzyEggg	6f9096c613	Add Sweet Veil	2019-03-31 22:02:39 +02:00
PikalaxALT	5a0142da08	infer additional file split after task00_mystery_gift	2019-03-31 15:53:38 -04:00
DizzyEggg	b12334c88b	Remove cases from ABE, add functionality of Flower Veil	2019-03-31 21:38:58 +02:00
Papa Cancer	1d5cf3acb5	Misc. move updates ... Bind: 75% Acc -> 85% Acc Disable: 55% Acc. -> 100% Acc. Freeze-Dry: 10% chance to freeze Hammer Arm and Ice Hammer: lower user's speed High Jump Kick: 130BP, 10 PP Jump Kick: 100BP, 10 PP Tail Glow: raises Sp. Atk by 3 stages Waterfall: 20% chance to flinch	2019-03-31 18:25:37 +01:00
Papa Cancer	ebe2dc6bbb	Mat Block ... Nothing more needs to be said	2019-03-31 17:17:13 +01:00
PikalaxALT	db4e9505ad	Merge branch 'master' into mystery_gift	2019-03-31 10:39:11 -04:00
Marcus Huderle	500d009b5c	Start decompiling berry_crush.c	2019-03-31 09:13:19 -05:00
huderlem	b9bf3bf072	Merge pull request #637 from DizzyEggg/pokeblock_attempt ... Use Pokeblock clean-up and some menu_specialised decomp	2019-03-31 08:39:18 -05:00
DizzyEggg	17e74756cb	Merge with master, add defines to atk49 and statbuffchange commands	2019-03-31 15:19:25 +02:00
DizzyEggg	aa7f69f067	Begin use pokeblock and menu specialised	2019-03-31 12:59:01 +02:00
PikalaxALT	5bf7886a70	through sub_8018798	2019-03-30 14:36:52 -04:00
PikalaxALT	ed53220be2	Start decompiling mystery gift	2019-03-30 13:15:48 -04:00
PikalaxALT	ccac4694cd	Merge branch 'master' into continue_union_room	2019-03-30 12:41:10 -04:00
DizzyEggg	35cffea987	Helpful macros for atk49	2019-03-30 08:29:56 -05:00
DizzyEggg	876be1d9cd	Merge pull request #104 from thechurchofcage/beta ... Spiky Shield	2019-03-30 11:21:27 +01:00
Marcus Huderle	accc5ae8dd	Merge remote-tracking branch 'upstream/master' into union_room_chat ... # Conflicts: # ld_script.txt	2019-03-29 21:27:08 -05:00
PikalaxALT	ae0e70d7bb	sub_80179D4 and rodata	2019-03-29 11:57:03 -04:00
PikalaxALT	7c45a7c443	port mevent_801BAAC from fire red	2019-03-28 07:32:25 -05:00
DizzyEggg	5dd653a89e	Use constants in atk89_statbuffchange	2019-03-27 07:47:01 -05:00
Marcus Huderle	af1baa89f1	Start decompiling union_room_chat.c	2019-03-26 21:58:20 -05:00
Papa Cancer	a3b4767dd2	Spiky Shield ... Created generic string "Atk was hurt by Def's BUFF" for use for both Spiky Shield and Rough Skin - can also be used for Aftermath and Rocky Helmet, when programmed	2019-03-26 17:45:34 +00:00
scnorton	2eba82b0fb	sub_8026634	2019-03-26 11:59:39 -04:00
Fontbane	fc69631a10	Field effects for Gen IV Abilities ... Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.	2019-03-25 17:49:29 -04:00
Marcus Huderle	e6caf0ff10	Port mevent2.c from pokefirered	2019-03-24 18:29:00 -05:00
Marcus Huderle	cf917a8733	Decompile berry_powder.c	2019-03-24 14:50:16 -05:00
Marcus Huderle	456cc3a6f0	Split out the remaining wireless-related files	2019-03-24 13:15:37 -05:00
Papa Cancer	61a7bd2788	Taunt fix etc. ... Taunt now works for the correct number of turns and has its own ending string - made by reusing the "Heal Block ends" string as a multi-purpose "X wore off" one. Fixed a bug in PREPARE_STRING_BUFFER and touched up the ENDTURN timers for various STATUS3's. Heal Block now displays the correct string when preventing usage of a move.	2019-03-24 12:54:01 +00:00
DizzyEggg	b8a634770f	Touch up Weak Armor	2019-03-23 16:56:56 +01:00
DizzyEggg	b9052fb37d	Touch Up Justified and Rattled	2019-03-23 16:37:56 +01:00
DizzyEggg	e135ea47e5	Touch up Anger Point	2019-03-23 16:33:08 +01:00
Marcus Huderle	a5ee2c14fd	Merge remote-tracking branch 'upstream/master' into use_pokeblock ... # Conflicts: # include/menu_specialized.h	2019-03-23 10:14:31 -05:00
Fontbane	e8add87bf3	Document Field Effects and some related text ... Also VAR_TRICK_HOUSE_LEVEL	2019-03-23 09:57:37 -05:00
Fontbane	7d54c2b960	EventScript and Text Documentation ... In event_script.s. Also renamed a couple events for consistency/detail.	2019-03-23 09:57:37 -05:00
DizzyEggg	53c60ab292	Merge branch 'master' into battle_engine_v2	2019-03-23 15:54:08 +01:00
Marcus Huderle	65391a1eb2	Merge remote-tracking branch 'upstream/master' into use_pokeblock ... # Conflicts: # src/use_pokeblock.c	2019-03-23 09:39:46 -05:00
Marcus Huderle	a7d5f032b1	Split into ereader_helpers.c, faraway_island.c, and ereader_screen.c	2019-03-22 14:16:26 -05:00
Marcus Huderle	f4f666f5af	Finish decompiling ereader.c	2019-03-22 13:36:06 -05:00
DizzyEggg	54ab6b43dc	Merge with master	2019-03-22 10:40:31 +01:00
Marcus Huderle	768a68d3e8	Decompile ereader.c up to faraway island code	2019-03-21 18:36:12 -05:00
Marcus Huderle	7118462b9f	Decompile ereader.c up to faraway island code	2019-03-21 18:28:44 -05:00
Marcus Huderle	e9a3cc6d51	Merge remote-tracking branch 'upstream/master' into move-tutor ... # Conflicts: # include/pokenav.h # src/battle_script_commands.c	2019-03-17 17:20:40 -05:00
Phlosioneer	092608aef6	Add a constant for "no music" on maps.	2019-03-16 12:31:29 -05:00
Phlosioneer	8cea949e6d	Move constant and EWRAM data into C.	2019-03-15 19:33:30 -04:00
Phlosioneer	8e1537fb57	Document map name popup flag	2019-03-10 09:23:58 -05:00
Phlosioneer	13c2f91b11	Moved last contest data into C	2019-03-09 23:51:39 -05:00
Phlosioneer	0c935a8bd5	Move the contest opponent filter to C	2019-03-09 22:54:17 -05:00
Phlosioneer	a32e8e7405	Move gContestOpponents into C ... 2,400 LOC by hand.	2019-03-09 20:56:36 -05:00
Phlosioneer	0e8f94a83e	Last bit of cleanup on contest_opponents	2019-03-09 02:49:57 -05:00
Phlosioneer	153499ed6f	Clean up contest_opponents.inc	2019-03-09 01:38:38 -05:00